diff options
| author | Ben Rosser <rosser.bjr@gmail.com> | 2015-09-24 13:52:20 -0400 |
|---|---|---|
| committer | Ben Rosser <rosser.bjr@gmail.com> | 2015-09-24 13:52:20 -0400 |
| commit | 7d2655aae78604f8cc09e961868d520b23c102ce (patch) | |
| tree | bcff045b7a348b21ea305ef3d3a7de885be501b5 | |
| parent | 3656c2fa5379a8ec7eb9fba1a2fdc1b91166bd15 (diff) | |
| download | gitlab-ce-7d2655aae78604f8cc09e961868d520b23c102ce.tar.gz | |
Remove 'kerberos' from auth_helper.rb for gitlab-CE.
There is no Kerberos auth in gitlab-ce, so it shouldn't be noted
as a form-driven auth mechanism in app/helpers/auth_helper.rb.
This breaks using Kerberos as a custom omniauth provider.
See issue #2510
| -rw-r--r-- | app/helpers/auth_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index ce7e9b1db87..cd99a232403 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -1,6 +1,6 @@ module AuthHelper PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2).freeze - FORM_BASED_PROVIDERS = [/\Aldap/, 'kerberos', 'crowd'].freeze + FORM_BASED_PROVIDERS = [/\Aldap/, 'crowd'].freeze def ldap_enabled? Gitlab.config.ldap.enabled |