Merge branch 'hide-empty-merge-request-diffs' into 'master'

Fix errors happening when source branch of merge request is removed and then restored

See merge request !7568

1 files changed, 0 insertions, 10 deletions

diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 0220f7e1db2..e515bc9f89c 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -227,16 +227,6 @@ describe MergeRequests::RefreshService, services: true do
       end
     end
 
-    context 'when the source branch is deleted' do
-      it 'does not create a MergeRequestDiff record' do
-        refresh_service = service.new(@project, @user)
-
-        expect do
-          refresh_service.execute(@oldrev, Gitlab::Git::BLANK_SHA, 'refs/heads/master')
-        end.not_to change { MergeRequestDiff.count }
-      end
-    end
-
     def reload_mrs
       @merge_request.reload
       @fork_merge_request.reload