Alec Leamas 1481056af2 Revert "Merge remote branch 'upstream/master'" ... This reverts commit fb70dc8c99, reversing changes made to 53fef63a9a. Conflicts: pkg/fedora/diaspora-setup pkg/ubuntu/diaspora-setup public/stylesheets/sass/application.sass spec/models/user/attack_vectors_spec.rb		2010-10-20 14:59:55 +02:00
..
albums_controller_spec.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
aspects_controller_spec.rb	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
dev_utilities_controller_spec.rb	Rails.root isn't always defined when you get to the top of a spec file	2010-10-16 20:05:05 -07:00
people_controller_spec.rb	Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion	2010-10-13 23:49:13 -07:00
publics_controller_spec.rb	attack vector where you take posts from valid (unknown) diaspora people is now fixed	2010-10-20 00:42:33 -07:00
registrations_controller_spec.rb	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
requests_controller_spec.rb	Controller and module specs and code to prevent a fatal error when you try to befriend yourself	2010-10-17 19:05:19 -04:00
sockets_controller_spec.rb	Fix pending spec in SocketsControllerSpec	2010-10-09 21:58:46 -06:00
status_message_controller_spec.rb	removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller	2010-10-17 20:47:51 -07:00
users_controller_spec.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00