diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-07-02 16:33:38 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-07-23 15:20:12 +0200 |
| commit | 70a3c165a9f3882a82cf8946a783ace091635797 (patch) | |
| tree | 2d09f34639859b2eadf5b648ac42f55b2419ceb2 /app/controllers/application_controller.rb | |
| parent | 5dd4dea93baa6386ed860a50125dce3ca3890f16 (diff) | |
| download | gitlab-ce-70a3c165a9f3882a82cf8946a783ace091635797.tar.gz | |
Allow custom label to be set for authentication providers.auth-icons-labels
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 362b03e0d5e..3ce8dbc9407 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -299,14 +299,14 @@ class ApplicationController < ActionController::Base end def github_import_enabled? - OauthHelper.enabled_oauth_providers.include?(:github) + Gitlab::OAuth::Provider.enabled?(:github) end def gitlab_import_enabled? - OauthHelper.enabled_oauth_providers.include?(:gitlab) + Gitlab::OAuth::Provider.enabled?(:gitlab) end def bitbucket_import_enabled? - OauthHelper.enabled_oauth_providers.include?(:bitbucket) && Gitlab::BitbucketImport.public_key.present? + Gitlab::OAuth::Provider.enabled?(:bitbucket) && Gitlab::BitbucketImport.public_key.present? end end |
