summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-07 16:47:37 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-07 16:47:37 +0300
commite6f58cb87da914f2a424df66b680e19e49dcd2e6 (patch)
treee5437a3200cec4fa693d8d49177445892b5a2e93 /lib
parent5436d6afd614f929a67c8b0257fa1644823d55b3 (diff)
downloadgitlab-ce-e6f58cb87da914f2a424df66b680e19e49dcd2e6.tar.gz
Avoid false validation when create user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/oauth/user.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/oauth/user.rb b/lib/gitlab/oauth/user.rb
index 94a76f11685..1bac93378ef 100644
--- a/lib/gitlab/oauth/user.rb
+++ b/lib/gitlab/oauth/user.rb
@@ -34,14 +34,13 @@ module Gitlab
# In this case we generate temporary email and force user to fill it later
if user.email.blank?
user.generate_tmp_oauth_email
- user.save!(validate: false)
else
# Google oauth returns email but dont return nickname
# So we use part of email as username for new user
user.username = email.match(/^[^@]*/)[0]
- user.save
end
+ user.save!
log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"
if Gitlab.config.omniauth['block_auto_created_users'] && !ldap?