-
- Downloads
Merge branch 'add_website_url_to_user' of...
Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
No related branches found
No related tags found
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/models/user.rb 13 additions, 2 deletionsapp/models/user.rb
- app/views/admin/users/_form.html.haml 3 additions, 0 deletionsapp/views/admin/users/_form.html.haml
- app/views/profiles/show.html.haml 3 additions, 0 deletionsapp/views/profiles/show.html.haml
- app/views/users/_profile.html.haml 4 additions, 0 deletionsapp/views/users/_profile.html.haml
- db/migrate/20140116231608_add_website_url_to_users.rb 5 additions, 0 deletionsdb/migrate/20140116231608_add_website_url_to_users.rb
- db/schema.rb 2 additions, 1 deletiondb/schema.rb
- doc/api/session.md 1 addition, 0 deletionsdoc/api/session.md
- doc/api/users.md 6 additions, 0 deletionsdoc/api/users.md
- features/profile/profile.feature 2 additions, 2 deletionsfeatures/profile/profile.feature
- features/steps/profile/profile.rb 4 additions, 2 deletionsfeatures/steps/profile/profile.rb
- lib/api/entities.rb 1 addition, 1 deletionlib/api/entities.rb
- lib/api/users.rb 3 additions, 1 deletionlib/api/users.rb
- spec/models/user_spec.rb 46 additions, 0 deletionsspec/models/user_spec.rb
Loading
Please register or sign in to comment