Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 0 deletions

diff --git a/spec/factories/bulk_import/trackers.rb b/spec/factories/bulk_import/trackers.rb
index 3e69ab26801..3d5d88954ed 100644
--- a/spec/factories/bulk_import/trackers.rb
+++ b/spec/factories/bulk_import/trackers.rb
@@ -24,5 +24,13 @@ FactoryBot.define do
     trait :skipped do
       status { -2 }
     end
+
+    trait :batched do
+      batched { true }
+    end
+
+    trait :stale do
+      created_at { 1.day.ago }
+    end
   end
 end
diff --git a/spec/factories/project_hooks.rb b/spec/factories/project_hooks.rb
index 3e70b897df6..34797bd933e 100644
--- a/spec/factories/project_hooks.rb
+++ b/spec/factories/project_hooks.rb
@@ -28,6 +28,7 @@ FactoryBot.define do
       deployment_events { true }
       feature_flag_events { true }
       releases_events { true }
+      emoji_events { true }
     end
 
     trait :with_push_branch_filter do