diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 16:47:37 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 16:47:37 +0300 |
commit | e6f58cb87da914f2a424df66b680e19e49dcd2e6 (patch) | |
tree | e5437a3200cec4fa693d8d49177445892b5a2e93 | |
parent | 5436d6afd614f929a67c8b0257fa1644823d55b3 (diff) | |
download | gitlab-ce-e6f58cb87da914f2a424df66b680e19e49dcd2e6.tar.gz |
Avoid false validation when create user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | app/models/user.rb | 2 | ||||
-rw-r--r-- | 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? |