diff options
| author | jhampton <jhampton@gitlab.com> | 2018-12-07 13:21:43 -0500 |
|---|---|---|
| committer | jhampton <jhampton@gitlab.com> | 2018-12-07 13:21:43 -0500 |
| commit | 6de31cddb81613045ae4ac920a054c53f2028949 (patch) | |
| tree | 5da9d29ba985e9ce2b81f02c33fd43b222e91e10 /app/controllers/oauth/applications_controller.rb | |
| parent | 02ef0523634123f3abc3dd6235ff229e38f40341 (diff) | |
| parent | 88c0984d077e2a85d684d71d036d27278cd81182 (diff) | |
| download | gitlab-ce-6de31cddb81613045ae4ac920a054c53f2028949.tar.gz | |
Merge remote-tracking branch 'origin/master' into 20422-hide-ui-variables-by-default
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 b50f140dc80..ab4ca56bb49 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -9,7 +9,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController before_action :verify_user_oauth_applications_enabled, except: :index before_action :authenticate_user! before_action :add_gon_variables - before_action :load_scopes, only: [:index, :create, :edit] + before_action :load_scopes, only: [:index, :create, :edit, :update] helper_method :can? |