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

a1830b5d

Commit a1830b5d authored 14 years ago by danielvincent

Downloads
- Plain Diff

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

parents e880a5a1 93476c44

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/views/people/show.html.haml 1 addition, 1 deletion

app/views/people/show.html.haml
config/locales/diaspora/en.yml 1 addition, 0 deletions

config/locales/diaspora/en.yml
spec/lib/diaspora_parser_spec.rb 49 additions, 90 deletions

spec/lib/diaspora_parser_spec.rb
spec/lib/web_hooks_spec.rb 4 additions, 14 deletions

spec/lib/web_hooks_spec.rb
spec/models/aspect_spec.rb 2 additions, 12 deletions

spec/models/aspect_spec.rb
spec/models/comments_spec.rb 86 additions, 99 deletions

spec/models/comments_spec.rb
spec/models/user/receive_spec.rb 4 additions, 1 deletion

spec/models/user/receive_spec.rb
spec/models/user/visible_posts_spec.rb 67 additions, 79 deletions

spec/models/user/visible_posts_spec.rb

with 214 additions and 296 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