diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-01 11:49:22 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-01 11:49:22 +0000 |
| commit | 7d3e888d069c3035b25f0dc8ff5efc8e52063db9 (patch) | |
| tree | 7fa412989e927b6f66b4b2b23f59caeb70310bb8 /lib/gitlab/auth.rb | |
| parent | 538852fe5f15a779708ef51ca9e647100d41bdf1 (diff) | |
| parent | 37383d9a9d9706008a7fa1d90079cb019681094b (diff) | |
| download | gitlab-ce-7d3e888d069c3035b25f0dc8ff5efc8e52063db9.tar.gz | |
Merge branch '37202-revert-changes-to-signing-enabled' into 'master'
Rollback changes made to signing_enabled.
Closes #37202
See merge request !13956
Diffstat (limited to 'lib/gitlab/auth.rb')
| -rw-r--r-- | lib/gitlab/auth.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index 1790f380c33..3fd81759d25 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -50,10 +50,6 @@ module Gitlab # Avoid resource intensive login checks if password is not provided return unless password.present? - # Nothing to do here if internal auth is disabled and LDAP is - # not configured - return unless current_application_settings.password_authentication_enabled? || Gitlab::LDAP::Config.enabled? - Gitlab::Auth::UniqueIpsLimiter.limit_user! do user = User.by_login(login) |