Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-26 09:08:37 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-26 09:08:37 +0300
commit864dae0d98424b463501c21eda1b633c14956fa9 (patch)
tree9340f7dad0a32f7e8c8a3b5ad723fbf0de26c3ba /config
parent47ef8c6c530ee1cac0e1046b098755ec949da894 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/work_items_hierarchy.yml (renamed from config/feature_flags/development/ci_trigger_forward_variables.yml)12
-rw-r--r--config/sidekiq_queues.yml4
2 files changed, 6 insertions, 10 deletions
diff --git a/config/feature_flags/development/ci_trigger_forward_variables.yml b/config/feature_flags/development/work_items_hierarchy.yml
index 4767ca0cb75..439fb941eb9 100644
--- a/config/feature_flags/development/ci_trigger_forward_variables.yml
+++ b/config/feature_flags/development/work_items_hierarchy.yml
@@ -1,8 +1,8 @@
---
-name: ci_trigger_forward_variables
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82676
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355572
-milestone: '14.9'
+name: work_items_hierarchy
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88504
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363447
+milestone: '15.1'
type: development
-group: group::pipeline authoring
-default_enabled: true
+group: group::product planning
+default_enabled: false
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 780ef1cf2ac..28f5eaf92d7 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -233,10 +233,6 @@
- 1
- - issuables_clear_groups_issue_counter
- 1
-- - issue_placement
- - 2
-- - issue_rebalancing
- - 1
- - issues_placement
- 2
- - issues_rebalancing