Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

diaspora
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

e7d7e1f2

Commit e7d7e1f2 authored 14 years ago by danielvincent

Downloads
- Plain Diff

Merge branch 'master' of github.com:diaspora/diaspora

parents d2945c83 a01c1c74

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/aspects_controller.rb 2 additions, 1 deletion

app/controllers/aspects_controller.rb
app/models/user.rb 1 addition, 5 deletions

app/models/user.rb
spec/controllers/aspects_controller_spec.rb 32 additions, 6 deletions

spec/controllers/aspects_controller_spec.rb
spec/lib/diaspora_parser_spec.rb 3 additions, 5 deletions

spec/lib/diaspora_parser_spec.rb
spec/misc_spec.rb 1 addition, 22 deletions

spec/misc_spec.rb
spec/models/comments_spec.rb 3 additions, 3 deletions

spec/models/comments_spec.rb
spec/models/person_spec.rb 14 additions, 40 deletions

spec/models/person_spec.rb
spec/models/photo_spec.rb 3 additions, 4 deletions

spec/models/photo_spec.rb
spec/models/post_spec.rb 1 addition, 2 deletions

spec/models/post_spec.rb
spec/models/status_message_spec.rb 1 addition, 1 deletion

spec/models/status_message_spec.rb
spec/models/user/receive_spec.rb 21 additions, 68 deletions

spec/models/user/receive_spec.rb
spec/models/user/user_friending_spec.rb 45 additions, 56 deletions

spec/models/user/user_friending_spec.rb
spec/spec_helper.rb 0 additions, 7 deletions

spec/spec_helper.rb

with 127 additions and 220 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment