Raphael Sofaer 1af945de11 Merge branch 'master' into oauth ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb

2011-06-28 17:13:38 -07:00

..

diaspora

Don't n query in UsersController#public

2011-06-04 22:34:48 -07:00

postzord

Deal with ids from PG coming out as strings

2011-06-19 16:16:31 +02:00

direction_detector_spec.rb

fixed for ruby 1.9

2011-04-03 22:11:52 +02:00

encryptor_spec.rb

Made specs work with fixtures, spec_helper needs work

2011-01-18 13:31:10 -08:00

fake_spec.rb

Change some person_ids to author_ids

2011-03-09 15:28:27 -08:00

hcard_spec.rb

profile now knows about three images sizes, even in federation case

2010-11-30 13:40:41 -08:00

pubsubhubbub_spec.rb

Merge branch 'master' into oauth

2011-06-28 17:13:38 -07:00

rake_helper_spec.rb

Fix specs in the presence of fixture_builder

2011-01-18 10:25:26 -08:00

resque_job_logging_spec.rb

Remove annoying constant warning from resque spec

2011-03-19 21:12:43 -07:00

salmon_salmon_spec.rb

Changing message to text, partway done, deleted data conversion

2011-03-14 11:39:31 -07:00

splunk_logging_spec.rb

Clean up the SplunkLogging mixin to make searching in the splunk console a little easier

2011-06-04 18:37:20 -07:00

web_hooks_spec.rb

posts now have authors instead of people

2011-03-01 18:05:05 -08:00

webfinger_profile_spec.rb

EM websocket cleanly merged with master. webfingering is now async

2010-10-29 11:05:17 -07:00

webfinger_spec.rb

Merge branch 'master' into oauth

2011-06-28 17:13:38 -07:00

youtube_titles_spec.rb

Added spec for YOUTUBE_ID_REGEX, we can easily add more youtube url sample here later to avoid polluting application_helper spec

2011-05-06 00:47:40 +08:00