From e6f58cb87da914f2a424df66b680e19e49dcd2e6 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 7 Apr 2014 16:47:37 +0300 Subject: [PATCH] Avoid false validation when create user Signed-off-by: Dmitriy Zaporozhets --- app/models/user.rb | 2 +- lib/gitlab/oauth/user.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 295f7d783be..58d90f03b34 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -468,6 +468,6 @@ class User < ActiveRecord::Base end def generate_tmp_oauth_email - self.email = "temp-email-for-oauth-#{username}" + self.email = "temp-email-for-oauth-#{username}@gitlab.localhost" end end 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? -- GitLab