Merge branch 'jej-fix-spec-failure-with-squashing' into 'master'

Fix spec failure for squash in progress error handling

See merge request !2343

spec/services/merge_requests/merge_service_spec.rb

@@ -210,6 +210,10 @@ describe MergeRequests::MergeService, services: true do
       end
 
       context 'when squashing' do
+        before do
+          merge_request.update!(source_branch: 'master', target_branch: 'feature')
+        end
+
         it 'logs and saves error if there is an error when squashing' do
           error_message = 'Failed to squash. Should be done manually'