From 61a403ff22db19c8482bbd701b6222a1e4b4eb99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20=C5=9Awi=C4=85tkowski?=
<pawel.swiatkowski@puzzleflow.com>
Date: Tue, 17 Jun 2014 14:13:01 +0200
Subject: [PATCH] ensure that uid is a string
---
lib/gitlab/oauth/user.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb
index c5be884a895..9ad75e63a04 100644
--- a/lib/gitlab/oauth/user.rb
+++ b/lib/gitlab/oauth/user.rb
@@ -61,7 +61,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
--
GitLab