Florian Staudacher 6c9cce7cda Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https		2014-02-09 13:05:39 +01:00
..
controllers	embedding youtube videos over https	2014-01-30 18:01:27 +01:00
fixtures	replace the monstrous link regex with a slightly less complicated one,	2012-10-11 23:39:44 +02:00
helpers	embedding youtube videos over https	2014-01-30 18:01:27 +01:00
integration	replace stub and mock deprecations with doubles	2014-01-13 12:25:38 +01:00
javascripts	Remove unused beta code	2014-01-24 09:01:30 +01:00
lib	replace stub and mock deprecations with doubles	2014-01-13 12:25:38 +01:00
mailers	update branding	2013-08-25 18:21:14 +02:00
models	update devise to 3.2	2014-01-15 12:59:59 +01:00
presenters	replace stub and mock deprecations with doubles	2014-01-13 12:25:38 +01:00
shared_behaviors	remove outer (deprecated) describe blocks from shared examples	2014-01-13 12:25:38 +01:00
support	replace mentions of out-of-aspect people in limited posts with just a	2013-06-09 19:16:40 +02:00
workers	Do not retry sending out posts on SSL errors. See #4728	2014-01-27 15:45:45 -08:00
factories.rb	refactor ConversationsController, move query builing to User model	2013-09-30 01:44:57 +02:00
helper_methods.rb	add specs for chromeframe	2012-09-30 17:04:50 +01:00
locale_spec.rb	fix french javascript pluralization rule and add specs for locale loading	2012-10-09 22:36:30 +02:00
misc_spec.rb	update factory girl	2012-09-12 13:24:23 +02:00
spec-doc.rb	This fixes issue #2298.	2011-11-02 23:51:12 -04:00
spec_helper.rb	do not overwrite rspec methods (receive)	2014-01-13 12:25:37 +01:00