diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 14:37:34 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 14:37:34 +0200 |
| commit | 90c338a49541c95452181af9e0d0bcf9da6c51ad (patch) | |
| tree | bdf4633d8e52fde86cdb956d8b6f2681190ff8b7 /app/controllers/oauth | |
| parent | cc4ef4da11d46761ab0ce4fbd6b032a7e01baba9 (diff) | |
| download | gitlab-ce-90c338a49541c95452181af9e0d0bcf9da6c51ad.tar.gz | |
Move helpers back to original directory
Diffstat (limited to 'app/controllers/oauth')
| -rw-r--r-- | app/controllers/oauth/applications_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/oauth/authorized_applications_controller.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index 4e007d2a4d0..dc22101cd5e 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -1,7 +1,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController include Gitlab::CurrentSettings - include Gitlab::PageLayoutHelper - + include 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 08d94408fc8..4193ac11399 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 Gitlab::PageLayoutHelper + include PageLayoutHelper layout 'profile' |