diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-20 15:08:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-20 15:08:53 +0000 |
| commit | 709948b7a69597b1efe24df9b0f388cc0b493dd9 (patch) | |
| tree | a6cbb0b7a1243c5308f8d5afb703d1980edb4595 /config | |
| parent | 50ea04b6c6823aa1bd8d64cd9a77dcbd03b19053 (diff) | |
| download | gitlab-ce-709948b7a69597b1efe24df9b0f388cc0b493dd9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
5 files changed, 27 insertions, 1 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 4282fa32a1b..2d279c7506c 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -133,7 +133,7 @@ - team_planning - tracing - user_management -- users +- user_profile - value_stream_management - vulnerability_management - web_ide diff --git a/config/feature_flags/development/improve_deployment_hooksworker_serialization.yml b/config/feature_flags/development/improve_deployment_hooksworker_serialization.yml new file mode 100644 index 00000000000..8392484b540 --- /dev/null +++ b/config/feature_flags/development/improve_deployment_hooksworker_serialization.yml @@ -0,0 +1,8 @@ +--- +name: improve_deployment_hooksworker_serialization +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108988 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388126 +milestone: '15.8' +type: development +group: group::release +default_enabled: false diff --git a/config/feature_flags/development/improved_spread_parallel_import.yml b/config/feature_flags/development/improved_spread_parallel_import.yml new file mode 100644 index 00000000000..803af69344f --- /dev/null +++ b/config/feature_flags/development/improved_spread_parallel_import.yml @@ -0,0 +1,8 @@ +--- +name: improved_spread_parallel_import +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109264 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/388665 +milestone: '15.9' +type: development +group: group::import +default_enabled: false diff --git a/config/feature_flags/development/move_cancel_pending_pipelines_to_async.yml b/config/feature_flags/development/move_cancel_pending_pipelines_to_async.yml new file mode 100644 index 00000000000..08009c7372a --- /dev/null +++ b/config/feature_flags/development/move_cancel_pending_pipelines_to_async.yml @@ -0,0 +1,8 @@ +--- +name: move_cancel_pending_pipelines_to_async +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106347 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385099 +milestone: '15.9' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index b542ba45aa8..de6e159921c 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -91,6 +91,8 @@ - 1 - - ci_cancel_pipeline - 1 +- - ci_cancel_redundant_pipelines + - 1 - - ci_delete_objects - 1 - - ci_job_artifacts_expire_project_build_artifacts |