Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Wessel <marco@poop.nl>2015-01-26 23:25:13 +0300
committerMarco Wessel <marco@poop.nl>2015-01-26 23:25:13 +0300
commit05b6bb4bf704c2a47d6b2717308ee2ad9b5eec81 (patch)
tree352c7f7a37bebd33260aef95bf76865f4d64319e /app/helpers/projects_helper.rb
parent7a84dcf2226f4b9be0c1ded92c91c2c6ef823970 (diff)
Don't require omniauth to be enabled, to use github importer
Diffstat (limited to 'app/helpers/projects_helper.rb')
-rw-r--r--app/helpers/projects_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index de232ab4e25..f780a8ffc3b 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -257,7 +257,7 @@ module ProjectsHelper
end
def github_import_enabled?
- Gitlab.config.omniauth.enabled && enabled_oauth_providers.include?(:github)
+ enabled_oauth_providers.include?(:github)
end
end