Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 5 deletions

diff --git a/config/feature_flags/development/monitor_logging.yml b/config/feature_flags/development/monitor_logging.yml
new file mode 100644
index 00000000000..e9e3f49a3bb
--- /dev/null
+++ b/config/feature_flags/development/monitor_logging.yml
@@ -0,0 +1,8 @@
+---
+name: monitor_logging
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86214
+rollout_issue_url:
+milestone: '15.0'
+type: development
+group: group::respond
+default_enabled: false
diff --git a/config/feature_flags/development/ci_reduce_persistent_ref_writes.yml b/config/feature_flags/development/optimized_project_and_group_activity_queries.yml
index 9329a1f5889..6efb0a3818a 100644
--- a/config/feature_flags/development/ci_reduce_persistent_ref_writes.yml
+++ b/config/feature_flags/development/optimized_project_and_group_activity_queries.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_reduce_persistent_ref_writes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83730
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354837
-milestone: '14.10'
+name: optimized_project_and_group_activity_queries
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85810
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360458
+milestone: '15.0'
 type: development
-group: group::pipeline execution
+group: group::workspace
 default_enabled: false
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 2bc050dfa67..8148e92d0e5 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -89,6 +89,8 @@ namespace :admin do
   get :instance_review, to: 'instance_review#index'
 
   resources :background_migrations, only: [:index, :show] do
+    resources :batched_jobs, only: [:show]
+
     member do
       post :pause
       post :resume