diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-01 11:49:39 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-01 11:49:39 +0000 |
| commit | cc5890f287b9dc5c117470d5b0925ba7f6d07485 (patch) | |
| tree | 7aa007de7a6900fe8d487526f8dba4545bee3cd0 /config/initializers | |
| parent | 78fe35ccc382372a4047630e3ccfafe8fabb5c00 (diff) | |
| parent | 7083b355a693e2de91aa7bcd7099c1a1690bc756 (diff) | |
| download | gitlab-ce-cc5890f287b9dc5c117470d5b0925ba7f6d07485.tar.gz | |
Merge branch '46481-preserve-warnings-even-if-passed' into 'master'
Resolve "A lot of constants redefinition warnings"
Closes #46481
See merge request gitlab-org/gitlab-ce!19286
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/2_gitlab.rb | 2 | ||||
| -rw-r--r-- | config/initializers/omniauth.rb | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/config/initializers/2_gitlab.rb b/config/initializers/2_gitlab.rb index 1d2ab606a63..8b7f245b7b0 100644 --- a/config/initializers/2_gitlab.rb +++ b/config/initializers/2_gitlab.rb @@ -1 +1 @@ -require_relative '../../lib/gitlab' +require_dependency 'gitlab' diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index e33ebb25c4c..a7fa926a853 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -19,12 +19,5 @@ end if Gitlab.config.omniauth.enabled provider_names = Gitlab.config.omniauth.providers.map(&:name) - require 'omniauth-kerberos' if provider_names.include?('kerberos') -end - -module OmniAuth - module Strategies - autoload :Bitbucket, Rails.root.join('lib', 'omni_auth', 'strategies', 'bitbucket') - autoload :Jwt, Rails.root.join('lib', 'omni_auth', 'strategies', 'jwt') - end + Gitlab::Auth.omniauth_setup_providers(provider_names) end |