Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

3 files changed, 24 insertions, 15 deletions

diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 4d25f24a104..ef8939bc5a9 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -89,7 +89,13 @@ namespace :admin do
 
   get :instance_review, to: 'instance_review#index'
 
-  resources :background_migrations, only: [:index]
+  resources :background_migrations, only: [:index] do
+    member do
+      post :pause
+      post :resume
+    end
+  end
+
   resource :health_check, controller: 'health_check', only: [:show]
   resource :background_jobs, controller: 'background_jobs', only: [:show]
 
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 641ca399547..65cdb8bba96 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -100,6 +100,18 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
+        resources :runners, only: [:index, :edit, :update, :destroy, :show] do
+          member do
+            post :resume
+            post :pause
+          end
+
+          collection do
+            post :toggle_shared_runners
+            post :toggle_group_runners
+          end
+        end
+
         namespace :settings do
           resource :ci_cd, only: [:show, :update], controller: 'ci_cd' do
             post :reset_cache
@@ -523,18 +535,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
       end
 
-      resources :runners, only: [:index, :edit, :update, :destroy, :show] do # rubocop: disable Cop/PutProjectRoutesUnderScope
-        member do
-          post :resume # rubocop:todo Cop/PutProjectRoutesUnderScope
-          post :pause # rubocop:todo Cop/PutProjectRoutesUnderScope
-        end
-
-        collection do
-          post :toggle_shared_runners # rubocop:todo Cop/PutProjectRoutesUnderScope
-          post :toggle_group_runners # rubocop:todo Cop/PutProjectRoutesUnderScope
-        end
-      end
-
       resources :runner_projects, only: [:create, :destroy] # rubocop: disable Cop/PutProjectRoutesUnderScope
       resources :badges, only: [:index] do # rubocop: disable Cop/PutProjectRoutesUnderScope
         collection do
@@ -547,7 +547,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
       end
 
-      scope :usage_ping, controller: :usage_ping do
+      scope :service_ping, controller: :service_ping do
         post :web_ide_clientside_preview # rubocop:todo Cop/PutProjectRoutesUnderScope
         post :web_ide_pipelines_count # rubocop:todo Cop/PutProjectRoutesUnderScope
       end
@@ -590,7 +590,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
                                             :tracing,
                                             :serverless, :clusters, :audit_events, :wikis, :merge_requests,
                                             :vulnerability_feedback, :security, :dependencies, :issues,
-                                            :pipelines, :pipeline_schedules, :snippets)
+                                            :pipelines, :pipeline_schedules, :runners, :snippets)
     end
 
     # rubocop: disable Cop/PutProjectRoutesUnderScope
diff --git a/config/routes/user.rb b/config/routes/user.rb
index 5f746eb6670..109179f76f1 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+get  'unsubscribes/:email', to: 'users/unsubscribes#show', as: :unsubscribe
+post 'unsubscribes/:email', to: 'users/unsubscribes#create'
+
 # Allows individual providers to be directed to a chosen controller
 # Call from inside devise_scope
 def override_omniauth(provider, controller, path_prefix = '/users/auth')