diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-09 22:52:37 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-09 22:52:37 +0300 |
| commit | f08a8ae18f74ad086695d62ff78ada2796e65829 (patch) | |
| tree | f65d9be5c66eb0d1ad8ceb1c13eb5c0da6bc2496 /lib/gitlab/o_auth/provider.rb | |
| parent | 66bbf30ed8bb006d9a968693fef266c86ec2325f (diff) | |
| parent | abc61f260074663e5711d3814d9b7d301d07a259 (diff) | |
Merge commit 'abc61f260074663e5711d3814d9b7d301d07a259' into 9-3-stable
Diffstat (limited to 'lib/gitlab/o_auth/provider.rb')
| -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 |