diff options
author | Rémy Coutable <remy@rymai.me> | 2017-03-13 14:07:38 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-03-13 14:29:55 +0100 |
commit | c5e34da01d6ef4717f934754c9c2d1beadd8c55e (patch) | |
tree | 0a2aabf7b1156c8f36fe273f795ea3bf2d16a38e /config/initializers/omniauth.rb | |
parent | 32da7602686f2b8161175d82b121deb9e01b2db5 (diff) | |
download | gitlab-ce-c5e34da01d6ef4717f934754c9c2d1beadd8c55e.tar.gz |
Remove explicit `require` calls, and use `require_dependency` when needed29389-fix-already-initialized-constants
See
http://guides.rubyonrails.org/autoloading_and_reloading_constants.html
for more info.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config/initializers/omniauth.rb')
-rw-r--r-- | config/initializers/omniauth.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index ab5a0561b8c..f7fa6d1c2de 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -20,15 +20,12 @@ OmniAuth.config.before_request_phase do |env| end if Gitlab.config.omniauth.enabled - Gitlab.config.omniauth.providers.each do |provider| - if provider['name'] == 'kerberos' - require 'omniauth-kerberos' - end - end + 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', 'omniauth', 'strategies', 'bitbucket') + autoload :Bitbucket, Rails.root.join('lib', 'omni_auth', 'strategies', 'bitbucket') end end |