diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-12 21:08:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-12 21:08:58 +0300 |
commit | 31f59b55c63f6a7add79c5987731387ae3a4f7ab (patch) | |
tree | 3786af9493ae5634b35098a184993b2f134a5286 /spec/factories | |
parent | 8562dfae56800770e729dcb8215ebf7e1e29a55f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/bulk_import/trackers.rb | 8 | ||||
-rw-r--r-- | spec/factories/project_hooks.rb | 1 |
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 |