diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-01-27 18:33:09 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-01-27 18:33:09 +0000 |
| commit | 79ca8146f3c1fa7bc5b33790438b86e2dd70ba1b (patch) | |
| tree | b52a4cc4bcb6c1f3738194321ea82d81ce6044ba /app/helpers | |
| parent | 6182f1cabf08e75b01146198cbd09fdea0bfdb67 (diff) | |
| parent | 05b6bb4bf704c2a47d6b2717308ee2ad9b5eec81 (diff) | |
| download | gitlab-ce-79ca8146f3c1fa7bc5b33790438b86e2dd70ba1b.tar.gz | |
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
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index db4bb303d0f..58153a50f84 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -263,7 +263,7 @@ module ProjectsHelper end def github_import_enabled? - Gitlab.config.omniauth.enabled && enabled_oauth_providers.include?(:github) + enabled_oauth_providers.include?(:github) end end |