nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec
History
ilya 08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
2010-09-27 15:39:50 -07:00
..
controllers Merging upstream changes 2010-09-25 15:57:59 -07:00
fixtures Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-27 15:39:50 -07:00
helpers Move relationship_flow spec to its helper spec 2010-09-25 13:18:46 -04:00
lib moved the private key into user where it belongs, two failing cucumber tests 2010-09-26 22:08:42 -07:00
models Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-27 15:39:50 -07:00
factories.rb Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-27 15:39:50 -07:00
misc_spec.rb Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
spec_helper.rb Disabled image resizing in specs => 15% faster test suite. FTW 2010-09-26 00:40:40 -07:00
user_encryption_spec.rb moved the private key into user where it belongs, two failing cucumber tests 2010-09-26 22:08:42 -07:00