diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-23 20:26:16 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-23 20:26:16 +0300 |
| commit | 931f27ae32f82ecc58d8889dbcd32db22a021659 (patch) | |
| tree | 81cfb435f3d942bc23ed5d06e31c19c6e14d964d | |
| parent | 9e613b91d6711ed46f287ac619e021f4c88d366a (diff) | |
| parent | 61a403ff22db19c8482bbd701b6222a1e4b4eb99 (diff) | |
| download | gitlab-ce-931f27ae32f82ecc58d8889dbcd32db22a021659.tar.gz | |
Merge pull request #7141 from PuzzleFlow/uid_should_always_be_string
Ensure that uid in OAuth is a string
| -rw-r--r-- | lib/gitlab/oauth/user.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb index 94d59180e15..0056eb3a28b 100644 --- a/lib/gitlab/oauth/user.rb +++ b/lib/gitlab/oauth/user.rb @@ -67,7 +67,9 @@ module Gitlab end def uid - auth.info.uid || auth.uid + uid = auth.info.uid || auth.uid + uid = uid.to_s unless uid.nil? + uid end def email |