nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec/controllers
History
danielgrippi 60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
..
admins_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
apis_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
application_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
aspect_memberships_controller_spec.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
aspects_controller_spec.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
comments_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
contacts_controller_spec.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
conversation_visibilities_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
conversations_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
home_controller_spec.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
invitations_controller_spec.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
likes_controller_spec.rb use .js response convention for remote likeke behavior 2011-05-11 11:08:30 -07:00
messages_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
notifications_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
people_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
photos_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
post_visibilities_controller_spec.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
posts_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
profiles_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
publics_controller_spec.rb Add tag to rspec specs that generate jasmine fixtures 2011-05-07 13:54:55 -04:00
registrations_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
services_controller_spec.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
sessions_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
sockets_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
status_messages_controller_spec.rb Add tag to rspec specs that generate jasmine fixtures 2011-05-07 13:54:55 -04:00
tags_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00
users_controller_spec.rb moved render_views out of controller specs to spec_helper. 2011-05-07 18:38:40 +08:00