summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-03-11 23:38:25 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-03-13 16:51:09 -0400
commit8f21e2ae408a4ebd0e115846b9a639e7ce09a126 (patch)
treea5f6c45a79b30ab6c9d8afab117c3c534dd0cbfd /config
parent9f673aa498fed240db5c408b10d9107cec938aa3 (diff)
downloadgitlab-ce-8f21e2ae408a4ebd0e115846b9a639e7ce09a126.tar.gz
Let `oauth/applications#index` handle the `profiles#applications` routeapplication-settings
Previously we were doing all of kinds of code gymnastics and flash abuse in order to work with a Doorkeeper controller but have it _appear_ at the `/profile/applications` path. Fortunately we can just tell Rails to use a different controller to handle that route, and we get the best of both worlds.
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index a918b5bd3f0..92aaedf7b6e 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