diff options
| author | Mario de la Ossa <mdelaossa@gitlab.com> | 2018-02-02 18:39:55 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 18:39:55 +0000 |
| commit | eaada9d7066a20b5af815f723e09cde60a5c8c10 (patch) | |
| tree | 72ba4231e28f1c5e5405db21e0611a55e6428145 /app/controllers/oauth | |
| parent | 8fa2932dc5cc7687e7d85ae7b00c07fd9bcc24a4 (diff) | |
| download | gitlab-ce-eaada9d7066a20b5af815f723e09cde60a5c8c10.tar.gz | |
use Gitlab::UserSettings directly as a singleton instead of including/extending it
Diffstat (limited to 'app/controllers/oauth')
| -rw-r--r-- | app/controllers/oauth/applications_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index 2443f529c7b..6a21a3f77ad 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -1,5 +1,4 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController - include Gitlab::CurrentSettings include Gitlab::GonHelper include PageLayoutHelper include OauthApplications @@ -31,7 +30,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController private def verify_user_oauth_applications_enabled - return if current_application_settings.user_oauth_applications? + return if Gitlab::CurrentSettings.user_oauth_applications? redirect_to profile_path end |