Merge pull request #7141 from PuzzleFlow/uid_should_always_be_string

Ensure that uid in OAuth is a string
2014-07-23 20:26:16 +03:00 · 2014-07-23 20:26:16 +03:00 · 931f27ae32
parent 9e613b91d6 61a403ff22
commit 931f27ae32
1 changed files with 3 additions and 1 deletions
--- 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