diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-09-01 14:59:04 +0400 |
|---|---|---|
| committer | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-09-01 14:59:04 +0400 |
| commit | 0c34fa3ea0662f94fdc565cfd3f921db40733821 (patch) | |
| tree | d026b488685ef932ae195cea6c6324b077909161 /lib/gitlab | |
| parent | 4198b58a8c21bf99e370fa3dd1452bdb278a0be9 (diff) | |
Add tests for finding an oauth authenticated user
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/oauth/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb index 0056eb3a28b..8c426d810c2 100644 --- a/lib/gitlab/oauth/user.rb +++ b/lib/gitlab/oauth/user.rb @@ -67,7 +67,7 @@ module Gitlab end def uid - uid = auth.info.uid || auth.uid + uid = auth.info.try(:uid) || auth.uid uid = uid.to_s unless uid.nil? uid end |