Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index 6836d5d71f0..9fd6ebe783c 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -92,6 +92,16 @@ FactoryBot.define do
       target_branch { "feature_two" }
     end
 
+    trait(:without_merge_request_diff) do
+      after(:build) do |_|
+        MergeRequest.skip_callback(:create, :after, :ensure_merge_request_diff)
+      end
+
+      after(:create) do |_|
+        MergeRequest.set_callback(:create, :after, :ensure_merge_request_diff)
+      end
+    end
+
     trait :locked do
       state_id { MergeRequest.available_states[:locked] }
     end