Merge pull request #7141 from PuzzleFlow/uid_should_always_be_string

Ensure that uid in OAuth is a string

Merge pull request #7141 from PuzzleFlow/uid_should_always_be_string
931f27ae · Dmitriy Zaporozhets · 9e613b91 · 61a403ff · 931f27ae
Commit 931f27ae authored Jul 23, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

user.rb lib/gitlab/oauth/user.rb +3 -1

No files found.
--- 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