Merge branch '7622-fix-push-rules-for-commit-email' into 'master'

Check push rules against commit author for web-based merges

Closes #7622

See merge request gitlab-org/gitlab-ee!7468

ee/app/services/ee/merge_requests/merge_service.rb

@@ -31,8 +31,8 @@ module EE
           return false
         end
 
-        unless push_rule.author_email_allowed?(current_user.email)
-          handle_merge_error(log_message: "Commit author's email '#{current_user.email}' does not follow the pattern '#{push_rule.author_email_regex}'", save_message_on_model: true)
+        unless push_rule.author_email_allowed?(current_user.commit_email)
+          handle_merge_error(log_message: "Commit author's email '#{current_user.commit_email}' does not follow the pattern '#{push_rule.author_email_regex}'", save_message_on_model: true)
           return false
         end
 

ee/spec/services/merge_requests/merge_service_spec.rb

@@ -81,6 +81,12 @@ describe MergeRequests::MergeService do
         expect(service.hooks_validation_pass?(merge_request)).to be_falsey
         expect(merge_request.merge_error).not_to be_empty
       end
+
+      it 'validates against the commit email' do
+        user.commit_email = 'foo@unmatchedemaildomain.com'
+
+        expect(service.hooks_validation_pass?(merge_request)).to be_truthy
+      end
     end
 
     context 'fast forward merge request' do