diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-26 21:42:57 +0300 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-10-29 19:20:53 +0300 |
| commit | c847f172d25efc211045c363f4e55402ad250c09 (patch) | |
| tree | fb4f64f6f09476d7e937f4bc13c032ea9b7fad86 /app/models | |
| parent | 5091cc4f778facdbf53dc84349a1e6d9bc684220 (diff) | |
Merge branch 'fix_pat_auth-11-4' into 'security-11-4'
[11.4] Fix Token lookup for Git over HTTP and registry authentication
See merge request gitlab/gitlabhq!2577
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 2b918ce5bd1..986603dec96 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -463,7 +463,7 @@ class User < ActiveRecord::Base def find_by_personal_access_token(token_string) return unless token_string - PersonalAccessTokensFinder.new(state: 'active').find_by(token: token_string)&.user # rubocop: disable CodeReuse/Finder + PersonalAccessTokensFinder.new(state: 'active').find_by_token(token_string)&.user # rubocop: disable CodeReuse/Finder end # Returns a user for the given SSH key. |