Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 3 deletions

diff --git a/spec/factories/merge_request_diffs.rb b/spec/factories/merge_request_diffs.rb
index f93f3f22109..d81f355737e 100644
--- a/spec/factories/merge_request_diffs.rb
+++ b/spec/factories/merge_request_diffs.rb
@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :merge_request_diff do
-    association :merge_request, factory: :merge_request_without_merge_request_diff
+    association :merge_request, :skip_diff_creation
     state { :collected }
     commits_count { 1 }
 
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index 4941a31982f..390db24dde8 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -313,6 +313,12 @@ FactoryBot.define do
       sequence(:source_branch) { |n| "feature#{n}" }
     end
 
+    trait :skip_diff_creation do
+      before(:create) do |merge_request, _|
+        merge_request.skip_ensure_merge_request_diff = true
+      end
+    end
+
     after(:build) do |merge_request|
       target_project = merge_request.target_project
       source_project = merge_request.source_project
@@ -357,7 +363,5 @@ FactoryBot.define do
         merge_request.update!(labels: evaluator.labels)
       end
     end
-
-    factory :merge_request_without_merge_request_diff, class: 'MergeRequestWithoutMergeRequestDiff'
   end
 end