diff options
author | Stan Hu <stanhu@gmail.com> | 2016-06-07 23:15:45 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-06-08 05:52:04 -0700 |
commit | 3b50d96b8aaa7e18efded9a80c7641d1364de5c9 (patch) | |
tree | 8db3cd9db648e3d7c6802027cd470a4c73c71698 /app/controllers/oauth/applications_controller.rb | |
parent | 703026c03e3967831cb61f09fa983fca3e0b1d1b (diff) | |
download | gitlab-ce-3b50d96b8aaa7e18efded9a80c7641d1364de5c9.tar.gz |
Fix endless redirections when accessing user OAuth applications when they are disabled
Also hides the "Applications" nav button if OAuth applications are disabled by the admin.
Closes #14770
Diffstat (limited to 'app/controllers/oauth/applications_controller.rb')
-rw-r--r-- | app/controllers/oauth/applications_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index c6bdd0602c1..0f54dfa4efc 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -32,7 +32,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController def verify_user_oauth_applications_enabled return if current_application_settings.user_oauth_applications? - redirect_to applications_profile_url + redirect_to profile_path end def set_index_vars |