diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 21:06:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 21:06:37 +0000 |
| commit | 4682f5015a5a2d7eedb66b3c90aee931d3789d0b (patch) | |
| tree | 6240a8a5cf3584a893c6c3351141446e7856dc12 /app/controllers/oauth | |
| parent | 6d59e989185a7d2645792b713d1b5d95d46651fd (diff) | |
| download | gitlab-ce-4682f5015a5a2d7eedb66b3c90aee931d3789d0b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/oauth')
| -rw-r--r-- | app/controllers/oauth/applications_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/oauth/authorizations_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index ab4ca56bb49..12dc2d1af1c 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -5,6 +5,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController include Gitlab::Allowable include PageLayoutHelper include OauthApplications + include Gitlab::Experimentation::ControllerConcern before_action :verify_user_oauth_applications_enabled, except: :index before_action :authenticate_user! diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index 705389749d8..e65726dffbf 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController + include Gitlab::Experimentation::ControllerConcern layout 'profile' # Overridden from Doorkeeper::AuthorizationsController to |