diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-16 14:47:04 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-16 14:47:04 +0200 |
| commit | bd6239f8cf75d110b3e53eabb9395f29cdff6a21 (patch) | |
| tree | 8fcbb92cc7440c2ade88e2f26bd500d758b5fc37 | |
| parent | fb5ffa89a6fc7cf2b11e7f3e7175565f24573504 (diff) | |
| parent | 3e585c01e18fd2e3b6ca72f43aa0e3c9d4415f99 (diff) | |
| download | gitlab-ce-bd6239f8cf75d110b3e53eabb9395f29cdff6a21.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -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 |