Merge branch 'ff-merge' of dev.gitlab.org:gitlab/gitlab-ee into ff-merge

spec/services/merge_requests/ff_merge_service_spec.rb

@@ -3,10 +3,12 @@ require 'spec_helper'
 describe MergeRequests::FfMergeService do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
-  let(:merge_request) { create(:merge_request,
-                               source_branch: 'flatten-dir',
-                               target_branch: 'improve/awesome',
-                               assignee: user2) }
+  let(:merge_request) do
+    create(:merge_request,
+           source_branch: 'flatten-dir',
+           target_branch: 'improve/awesome',
+           assignee: user2)
+  end
   let(:project) { merge_request.project }
 
   before do
@@ -46,4 +48,3 @@ describe MergeRequests::FfMergeService do
     end
   end
 end
-

spec/services/merge_requests/rebase_service_spec.rb

@@ -2,9 +2,11 @@ require 'spec_helper'
 
 describe MergeRequests::RebaseService do
   let(:user) { create(:user) }
-  let(:merge_request) { create(:merge_request,
-                               source_branch: 'feature_conflict',
-                               target_branch: 'master')}
+  let(:merge_request) do
+    create(:merge_request,
+           source_branch: 'feature_conflict',
+           target_branch: 'master')
+  end
   let(:project) { merge_request.project }
 
   before do
@@ -27,5 +29,3 @@ describe MergeRequests::RebaseService do
     end
   end
 end
-
-