diff options
| author | Paweł Świątkowski <pawel.swiatkowski@puzzleflow.com> | 2014-06-17 14:13:01 +0200 |
|---|---|---|
| committer | katafrakt <inquebrantable@gmail.com> | 2014-06-21 11:00:54 +0200 |
| commit | 61a403ff22db19c8482bbd701b6222a1e4b4eb99 (patch) | |
| tree | 1bc5556fa231ea7f2f5ed8e91278bc17b4666657 | |
| parent | d1e424bd5c403d73d399bf0f92e39aefde56e638 (diff) | |
| download | gitlab-ce-61a403ff22db19c8482bbd701b6222a1e4b4eb99.tar.gz | |
ensure that uid 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 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 |