diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 17:14:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 17:14:06 +0000 |
| commit | 702f0d561ce6f90908e2ddd40f183d0007e92217 (patch) | |
| tree | f528ca51fa8d978c945ba993749c5d2154f11136 /config | |
| parent | 90432d32acd69cf91e647fc508045659cae26b1a (diff) | |
| download | gitlab-ce-702f0d561ce6f90908e2ddd40f183d0007e92217.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@13-3-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 76e29fb6c02..ad0b0c2008f 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -17,7 +17,7 @@ Doorkeeper.configure do end resource_owner_from_credentials do |routes| - user = Gitlab::Auth.find_with_user_password(params[:username], params[:password]) + user = Gitlab::Auth.find_with_user_password(params[:username], params[:password], increment_failed_attempts: true) user unless user.try(:two_factor_enabled?) end |