-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'dz-profile-organization' into 'master'
Add organization field to the user profile ## What does this MR do? Add organization field to the user profile ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So we can let users fill organization information separately ## Screenshots (if relevant)  ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21903 See merge request !6526
No related branches found
No related tags found
Pipeline #
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/controllers/profiles_controller.rb 2 additions, 1 deletionapp/controllers/profiles_controller.rb
- app/views/profiles/show.html.haml 3 additions, 0 deletionsapp/views/profiles/show.html.haml
- app/views/users/show.html.haml 5 additions, 1 deletionapp/views/users/show.html.haml
- db/migrate/20160926145521_add_organization_to_user.rb 12 additions, 0 deletionsdb/migrate/20160926145521_add_organization_to_user.rb
- db/schema.rb 2 additions, 1 deletiondb/schema.rb
- doc/api/users.md 8 additions, 1 deletiondoc/api/users.md
- features/steps/profile/profile.rb 2 additions, 0 deletionsfeatures/steps/profile/profile.rb
- lib/api/entities.rb 1 addition, 1 deletionlib/api/entities.rb
- lib/api/users.rb 4 additions, 2 deletionslib/api/users.rb
- spec/requests/api/users_spec.rb 9 additions, 0 deletionsspec/requests/api/users_spec.rb
Loading
Please register or sign in to comment