summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJan-Willem van der Meer <mail@jewilmeer.nl>2014-09-01 13:48:17 +0200
committerJan-Willem van der Meer <mail@jewilmeer.nl>2014-09-01 13:49:16 +0200
commit6143cef4c49d5a3e9c8c13a7328dcb6581d664f5 (patch)
tree1ac11c3d4a236d70951fcfcf5c1ee024106b8090 /lib
parent4198b58a8c21bf99e370fa3dd1452bdb278a0be9 (diff)
downloadgitlab-ce-6143cef4c49d5a3e9c8c13a7328dcb6581d664f5.tar.gz
Handle user creation if email is not provided
This fixes #1541
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/oauth/user.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb
index 0056eb3a28b..a252895493b 100644
--- a/lib/gitlab/oauth/user.rb
+++ b/lib/gitlab/oauth/user.rb
@@ -73,6 +73,7 @@ module Gitlab
end
def email
+ return unless auth.info.respond_to?(:email)
auth.info.email.downcase unless auth.info.email.nil?
end