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

dfef8d01

Commit dfef8d01 authored 14 years ago by Raphael

Downloads
- Plain Diff

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

parents 9c8e5146 e6de6179

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/models/user.rb 24 additions, 12 deletions

app/models/user.rb
lib/diaspora/user/querying.rb 5 additions, 0 deletions

lib/diaspora/user/querying.rb
spec/models/aspect_spec.rb 167 additions, 92 deletions

spec/models/aspect_spec.rb
spec/models/user/visible_posts_spec.rb 14 additions, 1 deletion

spec/models/user/visible_posts_spec.rb

with 210 additions and 105 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