diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-13 10:22:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-13 10:22:38 +0000 |
| commit | 6a1b3ef73f57d58d159e343f79e1f74418c2f763 (patch) | |
| tree | 6e7c0bb5efbe28acba6728132952538ea399779a /app/models/user.rb | |
| parent | 59f44052d8753247a4a7435780fcb41b43e274ac (diff) | |
| parent | 128b1eae092e4ee9384c99a4ba72b9122fc17e89 (diff) | |
| download | gitlab-ce-6a1b3ef73f57d58d159e343f79e1f74418c2f763.tar.gz | |
Merge branch 'zj-drop-ruby-21-tests' into 'master'
Update Rubocop to Ruby 2.3
See merge request !8994
Diffstat (limited to 'app/models/user.rb')
| -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 f9245cdb82a..867e61af56a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -314,7 +314,7 @@ class User < ActiveRecord::Base def find_by_personal_access_token(token_string) personal_access_token = PersonalAccessToken.active.find_by_token(token_string) if token_string - personal_access_token.user if personal_access_token + personal_access_token&.user end # Returns a user for the given SSH key. |