Merge branch 'krb_auth_helper_ce' into 'master'
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 (https://gitlab.com/gitlab-org/gitlab-ce/issues/2510). @DouweM suggested I send in this merge request. See merge request !1430
This commit is contained in:
commit
231ee19c81
1 changed files with 1 additions and 1 deletions
|
@ -1,6 +1,6 @@
|
||||||
module AuthHelper
|
module AuthHelper
|
||||||
PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2).freeze
|
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?
|
def ldap_enabled?
|
||||||
Gitlab.config.ldap.enabled
|
Gitlab.config.ldap.enabled
|
||||||
|
|
Loading…
Reference in a new issue