Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 8 deletions

diff --git a/config/feature_flags/development/single_file_file_by_file.yml b/config/feature_flags/development/single_file_file_by_file.yml
deleted file mode 100644
index bc38cf8afb2..00000000000
--- a/config/feature_flags/development/single_file_file_by_file.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: single_file_file_by_file
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111895'
-rollout_issue_url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403571'
-milestone: '15.11'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/user_approval_rules_removal.yml b/config/feature_flags/development/user_approval_rules_removal.yml
new file mode 100644
index 00000000000..eedec32b65a
--- /dev/null
+++ b/config/feature_flags/development/user_approval_rules_removal.yml
@@ -0,0 +1,8 @@
+---
+name: user_approval_rules_removal
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138691
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434141
+milestone: '16.7'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 2598a8d4ac4..5af17ae3ece 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -463,6 +463,8 @@
   - 1
 - - merge_requests_process_approval_auto_merge
   - 1
+- - merge_requests_remove_user_approval_rules
+  - 1
 - - merge_requests_resolve_todos
   - 1
 - - merge_requests_resolve_todos_after_approval