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>2023-08-02 18:07:15 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-08-02 18:07:15 +0300
commitb3432e3b6d3ad4baf73847907c4fea91b59288a5 (patch)
tree67faa17d1769222861e9ff11568ca770d38766e1 /config
parent7069eb1ee6cd6af1fa769df5a1175dffc4e3ddb1 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/log_discrepancies_repository_info_for_repository_size.yml8
-rw-r--r--config/feature_flags/development/use_metric_definitions_for_events_list.yml8
-rw-r--r--config/sidekiq_queues.yml8
3 files changed, 8 insertions, 16 deletions
diff --git a/config/feature_flags/development/log_discrepancies_repository_info_for_repository_size.yml b/config/feature_flags/development/log_discrepancies_repository_info_for_repository_size.yml
deleted file mode 100644
index ea63d86eb00..00000000000
--- a/config/feature_flags/development/log_discrepancies_repository_info_for_repository_size.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: log_discrepancies_repository_info_for_repository_size
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127050
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419300
-milestone: '16.3'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/use_metric_definitions_for_events_list.yml b/config/feature_flags/development/use_metric_definitions_for_events_list.yml
deleted file mode 100644
index fee19608502..00000000000
--- a/config/feature_flags/development/use_metric_definitions_for_events_list.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_metric_definitions_for_events_list
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122840
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416893
-milestone: '16.2'
-type: development
-group: group::analytics instrumentation
-default_enabled: false
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index bc5a2ec1d24..8d2219a0ef5 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -143,10 +143,18 @@
- 1
- - compliance_management_merge_requests_compliance_violations
- 1
+- - compliance_management_standards_gitlab_base
+ - 1
+- - compliance_management_standards_gitlab_group_base
+ - 1
- - compliance_management_standards_gitlab_prevent_approval_by_author
- 1
- - compliance_management_standards_gitlab_prevent_approval_by_author_group
- 1
+- - compliance_management_standards_gitlab_prevent_approval_by_committer
+ - 1
+- - compliance_management_standards_gitlab_prevent_approval_by_committer_group
+ - 1
- - compliance_management_update_default_framework
- 1
- - container_repository