diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-17 18:08:24 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-17 18:08:24 +0000 |
| commit | 726a414169e6c3219ff4fd410da3efd53fc7f912 (patch) | |
| tree | b3cb53c9bb0724aacbf2181911b2157c5abef67a /config | |
| parent | e96ee2a22ba56a77fcec371313e25d3b3c93cff2 (diff) | |
| parent | d444fd3460e896065c21abda9a1cafa93f9315a5 (diff) | |
| download | gitlab-ce-726a414169e6c3219ff4fd410da3efd53fc7f912.tar.gz | |
Merge branch 'chat-name-authorize' into 'master'
Allows to authorize chat user against GitLab.
This is needed for: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7438
See merge request !7450
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/profile.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/routes/profile.rb b/config/routes/profile.rb index 52b9a565db8..6b91485da9e 100644 --- a/config/routes/profile.rb +++ b/config/routes/profile.rb @@ -23,6 +23,12 @@ resource :profile, only: [:show, :update] do resource :preferences, only: [:show, :update] resources :keys, only: [:index, :show, :new, :create, :destroy] resources :emails, only: [:index, :create, :destroy] + resources :chat_names, only: [:index, :new, :create, :destroy] do + collection do + delete :deny + end + end + resource :avatar, only: [:destroy] resources :personal_access_tokens, only: [:index, :create] do |