diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-13 03:19:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-13 03:19:10 +0300 |
commit | fa1b90364dc73f27dc78b9d27114e4a197f2cfcb (patch) | |
tree | f72d9e2a7355687d977bfe0c01bdb42238e98d27 /config | |
parent | ac48f7c24110a7a1e0a0aa49fc7838ab03c28374 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/feature_flags/development/reduce_sub_batch_size_on_timeouts.yml | 8 | ||||
-rw-r--r-- | config/sidekiq_queues.yml | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/config/feature_flags/development/reduce_sub_batch_size_on_timeouts.yml b/config/feature_flags/development/reduce_sub_batch_size_on_timeouts.yml deleted file mode 100644 index 507fce9cfe5..00000000000 --- a/config/feature_flags/development/reduce_sub_batch_size_on_timeouts.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: reduce_sub_batch_size_on_timeouts -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109354 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/393556 -milestone: '15.10' -type: development -group: group::database -default_enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index e4b1162a21d..ee8d137aca5 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -327,6 +327,8 @@ - 1 - - merge_requests_handle_assignees_change - 1 +- - merge_requests_llm_summarize_merge_request + - 1 - - merge_requests_resolve_todos - 1 - - merge_requests_resolve_todos_after_approval |