summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gitlab/oauth/user.rb4
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