Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

3 files changed, 5 insertions, 13 deletions

diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index d066dd2fb35..8148e92d0e5 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -88,7 +88,9 @@ namespace :admin do
 
   get :instance_review, to: 'instance_review#index'
 
-  resources :background_migrations, only: [:index] do
+  resources :background_migrations, only: [:index, :show] do
+    resources :batched_jobs, only: [:show]
+
     member do
       post :pause
       post :resume
@@ -100,7 +102,6 @@ namespace :admin do
   resource :background_jobs, controller: 'background_jobs', only: [:show]
 
   resource :system_info, controller: 'system_info', only: [:show]
-  resources :requests_profiles, only: [:index, :show], param: :name, constraints: { name: /.+\.(html|txt)/ }
 
   resources :projects, only: [:index]
 
diff --git a/config/routes/project.rb b/config/routes/project.rb
index a3f6139a6ef..6b2a9700686 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -303,15 +303,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         concerns :clusterable
 
-        namespace :serverless do
-          scope :functions do
-            get '/:environment_id/:id', to: 'functions#show'
-            get '/:environment_id/:id/metrics', to: 'functions#metrics', as: :metrics
-          end
-
-          resources :functions, only: [:index]
-        end
-
         resources :terraform, only: [:index]
 
         resources :google_cloud, only: [:index]
@@ -517,7 +508,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       end
 
       namespace :prometheus do
-        resources :alerts, constraints: { id: /\d+/ }, only: [:index, :create, :show, :update, :destroy] do # rubocop: disable Cop/PutProjectRoutesUnderScope
+        resources :alerts, constraints: { id: /\d+/ }, only: [:index, :show] do # rubocop: disable Cop/PutProjectRoutesUnderScope
           post :notify, on: :collection # rubocop:todo Cop/PutProjectRoutesUnderScope
           member do
             get :metrics_dashboard # rubocop:todo Cop/PutProjectRoutesUnderScope
diff --git a/config/routes/user.rb b/config/routes/user.rb
index 64dc56e18ec..ccacf817cc5 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -27,7 +27,7 @@ devise_controllers = { omniauth_callbacks: :omniauth_callbacks,
                        sessions: :sessions,
                        confirmations: :confirmations }
 
-if ::Gitlab.ee? && ::Gitlab::Geo.connected? && ::Gitlab::Geo.secondary?
+if ::Gitlab.ee? && ::Gitlab::Geo.secondary?(infer_without_database: true)
   devise_for :users, controllers: devise_controllers, path_names: { sign_in: 'auth/geo/sign_in',
                                                                     sign_out: 'auth/geo/sign_out' }
   # When using Geo, the other type of routes should be present as well, as browsers