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

Merge branch 'sh-fix-commit-email-migration' into 'master'

Browse source 
Return a default commit email if migration has not completed

Closes #51530

See merge request gitlab-org/gitlab-ce!21790
This commit is contained in:
Nick Thomas 2018-09-18 00:07:10 +00:00
commit 953018e3d4
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

@ -633,7 +633,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