diff options
| author | Drew Blessing <drew@gitlab.com> | 2016-11-11 14:44:08 -0600 |
|---|---|---|
| committer | Drew Blessing <drew@gitlab.com> | 2016-11-11 15:58:33 -0600 |
| commit | c50b98da723dab9a35ddb2cde0258d141cf92495 (patch) | |
| tree | ae9634e13bd663537df8a1eddd62f6c9edd1e019 /app/helpers/auth_helper.rb | |
| parent | 6eeff67c6e03233d4480a55d05d4e0f1a88aef4c (diff) | |
| download | gitlab-ce-c50b98da723dab9a35ddb2cde0258d141cf92495.tar.gz | |
Centralize LDAP config/filter logic
Centralize all LDAP config logic in `GitLab::LDAP::Config`. Previously,
some logic was in the Devise initializer and it was not honoring the
`user_filter`. If a user outside the configured `user_filter` signed
in, an account would be created but they would then be denied access.
Now that logic is centralized, the filter is honored and users outside
the filter are never created.
Diffstat (limited to 'app/helpers/auth_helper.rb')
| -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? |