Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-07 17:47:37 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-07 17:47:37 +0400
commite6f58cb87da914f2a424df66b680e19e49dcd2e6 (patch)
treee5437a3200cec4fa693d8d49177445892b5a2e93 /app/models
parent5436d6afd614f929a67c8b0257fa1644823d55b3 (diff)
Avoid false validation when create user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 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