diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-14 10:23:21 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-14 10:23:21 +0000 |
| commit | 2a90b69a8d968dc22ef630a948ae6f77fd927f23 (patch) | |
| tree | 2c96b404a545456d4a9fa213f9bcd6c654e2167c /app/helpers | |
| parent | d67932923f3faf4c8b5a466b511a39bb91b709ef (diff) | |
| parent | c50b98da723dab9a35ddb2cde0258d141cf92495 (diff) | |
| download | gitlab-ce-2a90b69a8d968dc22ef630a948ae6f77fd927f23.tar.gz | |
Merge branch 'user_filter_auth' into 'master'
Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter.
Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296
See merge request !6606
Diffstat (limited to 'app/helpers')
| -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 cd4d778e508..92bac149313 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -3,7 +3,7 @@ module AuthHelper FORM_BASED_PROVIDERS = [/\Aldap/, 'crowd'].freeze def ldap_enabled? - Gitlab.config.ldap.enabled + Gitlab::LDAP::Config.enabled? end def omniauth_enabled? |