Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 6 deletions

diff --git a/spec/services/merge_requests/conflicts/resolve_service_spec.rb b/spec/services/merge_requests/conflicts/resolve_service_spec.rb
index e11cccaa54a..002a07ff14e 100644
--- a/spec/services/merge_requests/conflicts/resolve_service_spec.rb
+++ b/spec/services/merge_requests/conflicts/resolve_service_spec.rb
@@ -12,15 +12,22 @@ RSpec.describe MergeRequests::Conflicts::ResolveService, feature_category: :code
   end
 
   let(:merge_request) do
-    create(:merge_request,
-           source_branch: 'conflict-resolvable', source_project: project,
-           target_branch: 'conflict-start')
+    create(
+      :merge_request,
+      source_branch: 'conflict-resolvable',
+      source_project: project,
+      target_branch: 'conflict-start'
+    )
   end
 
   let(:merge_request_from_fork) do
-    create(:merge_request,
-           source_branch: 'conflict-resolvable-fork', source_project: forked_project,
-           target_branch: 'conflict-start', target_project: project)
+    create(
+      :merge_request,
+      source_branch: 'conflict-resolvable-fork',
+      source_project: forked_project,
+      target_branch: 'conflict-start',
+      target_project: project
+    )
   end
 
   describe '#execute' do