Commit 1296d965 authored by Douwe Maan's avatar Douwe Maan

Merge branch 're-add-kerberos' into 'master'

Re-add Kerberos to AuthHelper form-based providers



See merge request !40
parents 09637cc9 6c6f37c8
module AuthHelper
PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2).freeze
FORM_BASED_PROVIDERS = [/\Aldap/, 'crowd'].freeze
FORM_BASED_PROVIDERS = [/\Aldap/, 'kerberos', 'crowd'].freeze
def ldap_enabled?
Gitlab.config.ldap.enabled
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment