Merge branch '6702-pushing-new-changes-to-mr-retains-approvals' into 'master'

Pushing to a merge request clears the approvals list if the respective project setting is enabled

Closes #6702

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

ee/app/services/ee/merge_requests/refresh_service.rb

@@ -18,8 +18,7 @@ module EE
         merge_requests.each do |merge_request|
           target_project = merge_request.target_project
 
-          if target_project.approvals_before_merge.nonzero? &&
-              target_project.reset_approvals_on_push &&
+          if target_project.reset_approvals_on_push &&
               merge_request.rebase_commit_sha != newrev
 
             merge_request.approvals.delete_all

ee/app/services/ee/merge_requests/update_service.rb

@@ -38,9 +38,7 @@ module EE
       def reset_approvals(merge_request)
         target_project = merge_request.target_project
 
-        if target_project.approvals_before_merge.nonzero? && target_project.reset_approvals_on_push
-          merge_request.approvals.delete_all
-        end
+        merge_request.approvals.delete_all if target_project.reset_approvals_on_push
       end
     end
   end

ee/changelogs/unreleased/6702-pushing-new-changes-to-mr-retains-approvals.yml

+---
+title: Pushing to a merge request clears the approvals list even if the respective project
+  setting is enabled and there is no fixed required number of approvals configured
+merge_request: 7328
+author:
+type: fixed

spec/services/merge_requests/refresh_service_spec.rb

@@ -354,8 +354,8 @@ describe MergeRequests::RefreshService do
           reload_mrs
         end
 
-        it 'does not reset approvals' do
-          expect(@merge_request.approvals).not_to be_empty
+        it 'resets approvals' do
+          expect(@merge_request.approvals).to be_empty
         end
       end
 

spec/services/merge_requests/update_service_spec.rb

@@ -578,7 +578,7 @@ describe MergeRequests::UpdateService, :mailer do
 
     context 'updating target_branch' do
       it 'resets approvals when target_branch is changed' do
-        merge_request.target_project.update(reset_approvals_on_push: true, approvals_before_merge: 2)
+        merge_request.target_project.update(reset_approvals_on_push: true)
         merge_request.approvals.create(user_id: user2.id)
 
         update_merge_request(target_branch: 'video')