Commit 6cdb4553 authored by Stan Hu's avatar Stan Hu

Return a default commit email if migration has not completed

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51530
parent a30e266e
...@@ -635,7 +635,7 @@ class User < ActiveRecord::Base ...@@ -635,7 +635,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