friend-refactor, also fixed more specs Conflicts: app/models/person.rb app/models/user.rb spec/factories.rb |
||
|---|---|---|
| .. | ||
| album.rb | ||
| blog.rb | ||
| bookmark.rb | ||
| comment.rb | ||
| person.rb | ||
| photo.rb | ||
| post.rb | ||
| profile.rb | ||
| request.rb | ||
| retraction.rb | ||
| status_message.rb | ||
| user.rb | ||
friend-refactor, also fixed more specs Conflicts: app/models/person.rb app/models/user.rb spec/factories.rb |
||
|---|---|---|
| .. | ||
| album.rb | ||
| blog.rb | ||
| bookmark.rb | ||
| comment.rb | ||
| person.rb | ||
| photo.rb | ||
| post.rb | ||
| profile.rb | ||
| request.rb | ||
| retraction.rb | ||
| status_message.rb | ||
| user.rb | ||