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

f97f63e2

Commit f97f63e2 authored 14 years ago by Raphael

Downloads
- Plain Diff

Merge remote branch 'tristil/239-380-identity-error-handling'

parents 4986de2c 4b588cce

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/requests_controller.rb 9 additions, 2 deletions

app/controllers/requests_controller.rb
app/models/person.rb 5 additions, 1 deletion

app/models/person.rb
config/locales/diaspora/en.yml 2 additions, 0 deletions

config/locales/diaspora/en.yml
spec/controllers/requests_controller_spec.rb 30 additions, 0 deletions

spec/controllers/requests_controller_spec.rb
spec/models/person_spec.rb 20 additions, 0 deletions

spec/models/person_spec.rb

with 66 additions and 3 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