gitlab-org--gitlab-foss/app/controllers
Dmitriy Zaporozhets b0af83f9ff 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)

![Screen_Shot_2016-09-26_at_7.32.27_PM](/uploads/d11a9a86aa22227f9c9915d195106c5f/Screen_Shot_2016-09-26_at_7.32.27_PM.png)

## 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
2016-09-27 12:42:42 +00:00
..
admin Syntax fixes and better tests for helper methods. Updated docs. 2016-09-15 14:10:49 -05:00
ci Code refactor 2016-09-07 12:10:49 +02:00
concerns Merge branch 'rc-new-members-approve-request-access-service' into 'master' 2016-09-27 12:10:12 +00:00
dashboard Merge branch 'issue_18135' into 'master' 2016-08-19 23:06:30 +00:00
explore
groups Add expiration date to group memberships 2016-08-18 21:09:17 +01:00
import modify github import JS and controller so we can now specify a namespace and/or name for a project. 2016-09-20 10:14:39 +02:00
oauth
profiles Address review comments from @smcgivern. 2016-08-18 22:12:02 +05:30
projects Revert part of "Merge branch 'update_issues_mr_counter' into 'master' 2016-09-22 15:43:43 +02:00
sherlock
abuse_reports_controller.rb
application_controller.rb Update specs - add mocks to simulate old versions 2016-09-01 14:00:46 +02:00
autocomplete_controller.rb Move to project dropdown with infinite scroll for better performance 2016-08-17 07:33:51 +02:00
confirmations_controller.rb
dashboard_controller.rb
emojis_controller.rb
groups_controller.rb Syntax fixes and better tests for helper methods. Updated docs. 2016-09-15 14:10:49 -05:00
health_check_controller.rb
help_controller.rb
invites_controller.rb
jwt_controller.rb Improve JwtController implementation 2016-09-20 19:15:13 +02:00
koding_controller.rb Split Koding admin/user docs 2016-08-22 17:09:15 +03:00
namespaces_controller.rb test if we can :read_group the group, not the namespace 2016-08-30 11:39:22 -07:00
notification_settings_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb
profiles_controller.rb Add organization field to user profile 2016-09-27 14:04:39 +03:00
projects_controller.rb Project tools visibility level 2016-09-01 11:47:59 -03:00
registrations_controller.rb
root_controller.rb
search_controller.rb Fixed search dropdown labels not displaying 2016-09-12 09:00:57 +01:00
sent_notifications_controller.rb Fix initial implementation to actually render the unsubscribe page 2016-09-20 09:52:57 +02:00
sessions_controller.rb
snippets_controller.rb Snippets get award emoji! 👍 2016-09-19 19:47:43 +03:00
uploads_controller.rb
users_controller.rb Fix snippets pagination 2016-09-26 12:42:12 +02:00