diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-02 21:09:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-02 21:09:02 +0300 |
| commit | f3c61892ecbcad3bfe57f06f197ae9e8996970db (patch) | |
| tree | 3333bd204168492ca70378a8c22928bee5998b72 /config | |
| parent | f5f72042cbd7cf07f6a621de495f053d576fa752 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_categories.yml | 2 | ||||
| -rw-r--r-- | config/feature_flags/development/fill_in_mr_template.yml | 8 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 74d0763c318..048d7384937 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -50,6 +50,7 @@ - disaster_recovery - dora_metrics - dynamic_application_security_testing +- editor_extensions - environment_management - error_budgets - error_tracking @@ -125,6 +126,7 @@ - source_code_management - static_application_security_testing - subscription_management +- switchboard - system_access - team_planning - tracing diff --git a/config/feature_flags/development/fill_in_mr_template.yml b/config/feature_flags/development/fill_in_mr_template.yml new file mode 100644 index 00000000000..871d2d09f2e --- /dev/null +++ b/config/feature_flags/development/fill_in_mr_template.yml @@ -0,0 +1,8 @@ +--- +name: fill_in_mr_template +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121233 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/412796 +milestone: '16.1' +type: development +group: group::code review +default_enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 970df2d4465..5c6ec888e54 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -551,6 +551,8 @@ - 1 - - security_scan_result_policies_sync_opened_merge_requests - 1 +- - security_scan_result_policies_sync_project + - 1 - - security_scans - 2 - - security_scans_purge_by_job_id |