Commit 79ca8146 authored by Valery Sizov's avatar Valery Sizov

Merge branch 'github-no-omniauth' into 'master'

Don't require omniauth to enable github importer

I noticed the github importer is only enabled when omniauth authentication is also enabled. That isn't actually necessary -- just the oauth keys from GitHub are required to be configured.

The fix for this is very simple.

See merge request !316
parents 6182f1ca 05b6bb4b
...@@ -263,7 +263,7 @@ module ProjectsHelper ...@@ -263,7 +263,7 @@ module ProjectsHelper
end end
def github_import_enabled? def github_import_enabled?
Gitlab.config.omniauth.enabled && enabled_oauth_providers.include?(:github) enabled_oauth_providers.include?(:github)
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment