diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 03:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 03:09:12 +0300 |
| commit | 6168721025dd8e98caeb2bf6844273e6690eaf69 (patch) | |
| tree | 8c4fb20d793669e488a739bc9951dab8b363eed4 /config | |
| parent | a89cb5cbdd832d4d9e80517973aceda6bc0a3856 (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/sidekiq_queues.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml index ce6bc891d10..924bdb58682 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -38,6 +38,7 @@ - dependency_scanning - design_management - devops_score +- digital_experience_management - disaster_recovery - dynamic_application_security_testing - epics @@ -96,7 +97,6 @@ - static_site_editor - status_page - subgroups -- synthetic_monitoring - system_testing - teams - templates diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 9a920a3e5e4..1cb19d18a0d 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -42,12 +42,12 @@ - 2 - - container_repository - 1 +- - create_commit_signature + - 2 - - create_evidence - 2 - - create_github_webhook - 2 -- - create_gpg_signature - - 2 - - create_note_diff_file - 1 - - cronjob |