diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-15 14:33:14 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-15 14:33:14 +0000 |
| commit | 90e91e28e40f2d5d5205e62f6e01e23af4da117f (patch) | |
| tree | b745cd4a914d2bef8dd9559f6aa8b2d0b15c7414 /config | |
| parent | ea7d062fa60e3e622288237fc66a815348bbcf36 (diff) | |
| parent | 8f21e2ae408a4ebd0e115846b9a639e7ce09a126 (diff) | |
| download | gitlab-ce-90e91e28e40f2d5d5205e62f6e01e23af4da117f.tar.gz | |
Merge branch 'application-settings' into 'master'
Applications tab on profile settings
Closes #13855
See merge request !3031
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 536397e318a..780ad757c5b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -295,7 +295,7 @@ Rails.application.routes.draw do resource :profile, only: [:show, :update] do member do get :audit_log - get :applications + get :applications, to: 'oauth/applications#index' put :reset_private_token put :update_username |