diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-31 13:00:41 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-31 13:00:41 +0300 |
| commit | 228926daee799c95e752a3c284c860e5bc60e528 (patch) | |
| tree | d073e4557ca0524263c97e2429610c9b5759b0be /lib | |
| parent | 32dde25a15ab9ccf22aca34c2c553fcdcc573ed3 (diff) | |
| parent | 04bb8fe9942f8558124f00e8cdfb50ef7059bf9e (diff) | |
Merge branch 'dm-oauth-config-for' into 'master'
Return nil when looking up config for unknown LDAP provider
Closes #29342
See merge request !11804
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/o_auth/provider.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/o_auth/provider.rb b/lib/gitlab/o_auth/provider.rb index 9ad7a38d505..ac9d66c836d 100644 --- a/lib/gitlab/o_auth/provider.rb +++ b/lib/gitlab/o_auth/provider.rb @@ -22,7 +22,11 @@ module Gitlab def self.config_for(name) name = name.to_s if ldap_provider?(name) - Gitlab::LDAP::Config.new(name).options + if Gitlab::LDAP::Config.valid_provider?(name) + Gitlab::LDAP::Config.new(name).options + else + nil + end else Gitlab.config.omniauth.providers.find { |provider| provider.name == name } end |