Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb
index 53406af2c4e..047600af267 100644
--- a/lib/gitlab/conflict/file_collection.rb
+++ b/lib/gitlab/conflict/file_collection.rb
@@ -21,11 +21,13 @@ module Gitlab
       def resolve(user, commit_message, files)
         msg = commit_message || default_commit_message
         resolution = Gitlab::Git::Conflict::Resolution.new(user, files, msg)
-        args = {
+
+        resolver.resolve_conflicts(
+          @source_repo,
+          resolution,
           source_branch: merge_request.source_branch,
           target_branch: merge_request.target_branch
-        }
-        resolver.resolve_conflicts(@source_repo, resolution, args)
+        )
       ensure
         @merge_request.clear_memoized_shas
       end