diff options
author | Robert Speicher <robert@gitlab.com> | 2017-08-08 19:31:24 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-08-08 19:31:24 +0000 |
commit | 85c38ddb1dbe56de87d8e98b1cfdd76a0c67838a (patch) | |
tree | 90b319cc31dc7b22e989e7c160bab4131cdb2c36 /app/models/concerns/token_authenticatable.rb | |
parent | b9da47d3b2c376ef8d0f6a951c0256bbc58b2854 (diff) | |
parent | 9770c57fab0315865a33c8b6df269eded0d57b5c (diff) | |
download | gitlab-ce-85c38ddb1dbe56de87d8e98b1cfdd76a0c67838a.tar.gz |
Merge branch 'add-rubocop-gitlab-security' into 'master'
Add rubocop-gitlab-security gem
See merge request !12177
Diffstat (limited to 'app/models/concerns/token_authenticatable.rb')
-rw-r--r-- | app/models/concerns/token_authenticatable.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/concerns/token_authenticatable.rb b/app/models/concerns/token_authenticatable.rb index 1ca7f91dc03..a7d5de48c66 100644 --- a/app/models/concerns/token_authenticatable.rb +++ b/app/models/concerns/token_authenticatable.rb @@ -44,7 +44,8 @@ module TokenAuthenticatable end define_method("ensure_#{token_field}!") do - send("reset_#{token_field}!") if read_attribute(token_field).blank? + send("reset_#{token_field}!") if read_attribute(token_field).blank? # rubocop:disable GitlabSecurity/PublicSend + read_attribute(token_field) end |