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

app/models/user.rb

@@ -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