diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-14 18:09:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-14 18:09:04 +0300 |
| commit | a3dfd311f4660fc81e929058abd6e136ac884ed3 (patch) | |
| tree | 4d7087cac6e2ca89df3adea98f92b9eddffa7790 /config | |
| parent | 7f408a3831590a1f98a1e1a04b63acba8937e36b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
4 files changed, 2 insertions, 24 deletions
diff --git a/config/feature_flags/development/async_add_build_failure_todo.yml b/config/feature_flags/development/async_add_build_failure_todo.yml deleted file mode 100644 index 3c1e056a50e..00000000000 --- a/config/feature_flags/development/async_add_build_failure_todo.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: async_add_build_failure_todo -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57490/diffs -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326726 -milestone: '13.11' -type: development -group: group::continuous integration -default_enabled: true diff --git a/config/feature_flags/development/pages_serve_from_migrated_zip.yml b/config/feature_flags/development/pages_serve_from_migrated_zip.yml deleted file mode 100644 index 2912beb3985..00000000000 --- a/config/feature_flags/development/pages_serve_from_migrated_zip.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: pages_serve_from_migrated_zip -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52573 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300021 -milestone: '13.9' -type: development -group: group::release -default_enabled: true diff --git a/config/feature_flags/development/product_intelligence_metrics_names_suggestions.yml b/config/feature_flags/development/product_intelligence_metrics_names_suggestions.yml deleted file mode 100644 index 6831dcdacd5..00000000000 --- a/config/feature_flags/development/product_intelligence_metrics_names_suggestions.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: product_intelligence_metrics_names_suggestions -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55733 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323460 -milestone: '13.10' -type: development -group: group::product intelligence -default_enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 7febb3770d1..c0aab89fd46 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -220,6 +220,8 @@ - 1 - - merge_requests_resolve_todos - 1 +- - merge_requests_sync_code_owner_approval_rules + - 1 - - metrics_dashboard_prune_old_annotations - 1 - - metrics_dashboard_sync_dashboards |