friend-refactor, also fixed more specs Conflicts: app/models/person.rb app/models/user.rb spec/factories.rb |
||
|---|---|---|
| .. | ||
| album_spec.rb | ||
| blogs_spec.rb | ||
| bookmark_spec.rb | ||
| comments_spec.rb | ||
| person_spec.rb | ||
| photo_spec.rb | ||
| post_spec.rb | ||
| profile_spec.rb | ||
| request_spec.rb | ||
| retraction_spec.rb | ||
| status_message_spec.rb | ||
| user_spec.rb | ||