kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Return a default commit email if migration has not completed

Browse source 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51530
This commit is contained in:
Stan Hu 2018-09-15 21:39:02 -07:00
parent a30e266e43
commit 6cdb455314
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -635,7 +635,7 @@ class User < ActiveRecord::Base
# possibility of the commit_email column not existing.
def commit_email
return unless has_attribute?(:commit_email)
return self.email unless has_attribute?(:commit_email)
# The commit email is the same as the primary email if undefined
super.presence || self.email