From 4c317531b4c23a09a4992dc8f3e2fb29f19cdeef Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 15 Jun 2015 18:04:30 +0200 Subject: If kerberos is enabled require it. --- config/initializers/7_omniauth.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/initializers/7_omniauth.rb b/config/initializers/7_omniauth.rb index 6f1f267bf97..f29216a2cf1 100644 --- a/config/initializers/7_omniauth.rb +++ b/config/initializers/7_omniauth.rb @@ -17,3 +17,10 @@ OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_s OmniAuth.config.before_request_phase do |env| OmniAuth::RequestForgeryProtection.new(env).call end + +if Gitlab.config.omniauth.enabled + Gitlab.config.omniauth.providers.each do |provider| + next unless provider['name'] == 'kerberos' + require 'omniauth-kerberos' + end +end -- cgit v1.2.1 From c6c3577bc6e49be3d0062983b0a5abdbcd39012a Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 16 Jun 2015 13:44:52 +0200 Subject: Use explicit if. --- config/initializers/7_omniauth.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/initializers/7_omniauth.rb b/config/initializers/7_omniauth.rb index f29216a2cf1..df73ec1304a 100644 --- a/config/initializers/7_omniauth.rb +++ b/config/initializers/7_omniauth.rb @@ -20,7 +20,8 @@ end if Gitlab.config.omniauth.enabled Gitlab.config.omniauth.providers.each do |provider| - next unless provider['name'] == 'kerberos' - require 'omniauth-kerberos' + if provider['name'] == 'kerberos' + require 'omniauth-kerberos' + end end end -- cgit v1.2.1