ensure that uid is a string

61a403ff · Paweł Świątkowski · katafrakt · d1e424bd · 61a403ff
Commit 61a403ff authored Jun 17, 2014 by Paweł Świątkowski Committed by katafrakt Jun 21, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

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