Commit 953018e3 authored by Nick Thomas's avatar Nick Thomas

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

Return a default commit email if migration has not completed

Closes #51530

See merge request gitlab-org/gitlab-ce!21790
parents 4b33b17b 6cdb4553
...@@ -633,7 +633,7 @@ class User < ActiveRecord::Base ...@@ -633,7 +633,7 @@ class User < ActiveRecord::Base
# possibility of the commit_email column not existing. # possibility of the commit_email column not existing.
def commit_email 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 # The commit email is the same as the primary email if undefined
super.presence || self.email super.presence || self.email
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment