diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-05 13:28:16 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-05 13:28:16 +0000 |
| commit | c12a4a9ac7c04a215adf6062fec7bf31231c7d4a (patch) | |
| tree | d7734c7f25d581744921e5e245661bad498b8251 /app/models | |
| parent | 19c5468a2788c8fd07a403997846712413324e75 (diff) | |
| parent | 8d900ade3832b3e2812f067ace19bad7fd286d54 (diff) | |
| download | gitlab-ce-c12a4a9ac7c04a215adf6062fec7bf31231c7d4a.tar.gz | |
Merge branch 'use_tokenauthenticatable_method_for_token_lookup' into 'master'
Remove PersonalAccessTokensFinder#find_by method
See merge request gitlab-org/gitlab-ce!22617
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index d3eb7162174..039a3854edb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -460,12 +460,6 @@ class User < ActiveRecord::Base by_username(username).take! end - 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 - end - # Returns a user for the given SSH key. def find_by_ssh_key_id(key_id) Key.find_by(id: key_id)&.user |