1 files changed, 12 insertions, 12 deletions
diff --git a/spec/services/merge_requests/resolve_service_spec.rb b/spec/services/merge_requests/resolve_service_spec.rb
index b7f475597b4..57b1c088ce4 100644
--- a/spec/services/merge_requests/resolve_service_spec.rb
+++ b/spec/services/merge_requests/resolve_service_spec.rb
@@ -58,8 +58,8 @@ describe MergeRequests::ResolveService do
         end
 
         it 'creates a commit with the correct parents' do
-          expect(merge_request.source_branch_head.parents.map(&:id))
-            .to eq(%w(1450cd639e0bc6721eb02800169e464f212cde06 
+          expect(merge_request.source_branch_head.parents.map(&:id)).
+            to eq(%w(1450cd639e0bc6721eb02800169e464f212cde06
                       824be604a34828eb682305f0d963056cfac87b2d))
         end
       end
@@ -84,8 +84,8 @@ describe MergeRequests::ResolveService do
         end
 
         it 'creates a commit with the correct parents' do
-          expect(merge_request_from_fork.source_branch_head.parents.map(&:id))
-            .to eq(['404fa3fc7c2c9b5dacff102f353bdf55b1be2813',
+          expect(merge_request_from_fork.source_branch_head.parents.map(&:id)).
+            to eq(['404fa3fc7c2c9b5dacff102f353bdf55b1be2813',
                     target_head])
         end
       end
@@ -124,8 +124,8 @@ describe MergeRequests::ResolveService do
       end
 
       it 'creates a commit with the correct parents' do
-        expect(merge_request.source_branch_head.parents.map(&:id))
-          .to eq(%w(1450cd639e0bc6721eb02800169e464f212cde06 
+        expect(merge_request.source_branch_head.parents.map(&:id)).
+          to eq(%w(1450cd639e0bc6721eb02800169e464f212cde06
                     824be604a34828eb682305f0d963056cfac87b2d))
       end
 
@@ -158,8 +158,8 @@ describe MergeRequests::ResolveService do
       let(:service) { MergeRequests::ResolveService.new(project, user, invalid_params) }
 
       it 'raises a MissingResolution error' do
-        expect { service.execute(merge_request) }
-          .to raise_error(Gitlab::Conflict::File::MissingResolution)
+        expect { service.execute(merge_request) }.
+          to raise_error(Gitlab::Conflict::File::MissingResolution)
       end
     end
 
@@ -184,8 +184,8 @@ describe MergeRequests::ResolveService do
       let(:service) { MergeRequests::ResolveService.new(project, user, invalid_params) }
 
       it 'raises a MissingResolution error' do
-        expect { service.execute(merge_request) }
-          .to raise_error(Gitlab::Conflict::File::MissingResolution)
+        expect { service.execute(merge_request) }.
+          to raise_error(Gitlab::Conflict::File::MissingResolution)
       end
     end
 
@@ -206,8 +206,8 @@ describe MergeRequests::ResolveService do
       let(:service) { MergeRequests::ResolveService.new(project, user, invalid_params) }
 
       it 'raises a MissingFiles error' do
-        expect { service.execute(merge_request) }
-          .to raise_error(MergeRequests::ResolveService::MissingFiles)
+        expect { service.execute(merge_request) }.
+          to raise_error(MergeRequests::ResolveService::MissingFiles)
       end
     end
   end