Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/factories/merge_request_diffs.rb b/spec/factories/merge_request_diffs.rb
index 481cabdae6d..f93f3f22109 100644
--- a/spec/factories/merge_request_diffs.rb
+++ b/spec/factories/merge_request_diffs.rb
@@ -10,12 +10,18 @@ FactoryBot.define do
     head_commit_sha { Digest::SHA1.hexdigest(SecureRandom.hex) }
     start_commit_sha { Digest::SHA1.hexdigest(SecureRandom.hex) }
 
+    diff_type { :regular }
+
     trait :external do
       external_diff { fixture_file_upload("spec/fixtures/doc_sample.txt", "plain/txt") }
       stored_externally { true }
       importing { true } # this avoids setting the state to 'empty'
     end
 
+    trait :merge_head do
+      diff_type { :merge_head }
+    end
+
     factory :external_merge_request_diff, traits: [:external]
   end
 end