diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-25 18:42:46 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-25 18:42:46 -0700 |
| commit | 046b28312704f3131e72dcd2dbdacc5264d4aa62 (patch) | |
| tree | a8c2b14a6e1db3b662fee2c79af70d9fcb643c2e /app/controllers/oauth | |
| parent | e449426a4e7d15cdd582d4f136add52cbfb5e04e (diff) | |
| download | gitlab-ce-046b28312704f3131e72dcd2dbdacc5264d4aa62.tar.gz | |
Groundwork for merging CI into CE
Diffstat (limited to 'app/controllers/oauth')
| -rw-r--r-- | app/controllers/oauth/applications_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/oauth/authorized_applications_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index fc31118124b..4e007d2a4d0 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -1,6 +1,6 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController include Gitlab::CurrentSettings - include PageLayoutHelper + include Gitlab::PageLayoutHelper before_action :verify_user_oauth_applications_enabled before_action :authenticate_user! diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb index 4193ac11399..08d94408fc8 100644 --- a/app/controllers/oauth/authorized_applications_controller.rb +++ b/app/controllers/oauth/authorized_applications_controller.rb @@ -1,5 +1,5 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController - include PageLayoutHelper + include Gitlab::PageLayoutHelper layout 'profile' |