diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-16 14:23:37 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-16 14:23:37 +0000 |
| commit | 1fb54a2d6b76ee45ff3b8d0207009c00fbe5f1d2 (patch) | |
| tree | f5e0b778a63dfa8210edeee02d6a2c50dc58dcb2 | |
| parent | f6ee9b3143924951e876bbf24e9329eb34f4850c (diff) | |
| parent | 940d38b065e77ba2abcc21375c439f899450f852 (diff) | |
| download | gitlab-ce-1fb54a2d6b76ee45ff3b8d0207009c00fbe5f1d2.tar.gz | |
Merge branch 'kerberos_require' into '7-12-stable'
Kerberos require to stable 7.12
!819 to 7-12-stable
cc @jacobvosmaer
See merge request !827
| -rw-r--r-- | config/initializers/7_omniauth.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/initializers/7_omniauth.rb b/config/initializers/7_omniauth.rb index 6f1f267bf97..df73ec1304a 100644 --- a/config/initializers/7_omniauth.rb +++ b/config/initializers/7_omniauth.rb @@ -17,3 +17,11 @@ 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| + if provider['name'] == 'kerberos' + require 'omniauth-kerberos' + end + end +end |