diaspora/spec/models/user
danielgrippi 106ae983d5 Merge branch 'master' into follow. all specs green.
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
..
attack_vectors_spec.rb fixed all specs 2011-04-05 10:00:54 -07:00
connecting_spec.rb fixed disconnecting logic. specs&cucumber green 2011-04-11 15:10:51 -07:00
invite_spec.rb added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
posting_spec.rb follow wip. 2 failures. 2011-04-04 19:22:19 -07:00
querying_spec.rb Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00