diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-07 15:16:46 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-07 15:16:46 +0100 |
| commit | 128b1eae092e4ee9384c99a4ba72b9122fc17e89 (patch) | |
| tree | 8eab2084903f6455c40e969cbc3d8ef02582288e /app/models/user.rb | |
| parent | 68db614d17c3ad984f7a5698d02475f71bde8941 (diff) | |
| download | gitlab-ce-zj-drop-ruby-21-tests.tar.gz | |
Update Rubocop to ruby 2.3zj-drop-ruby-21-tests
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 54f5388eb2c..15fe8084a9c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -304,7 +304,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. |