Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

4 files changed, 12 insertions, 17 deletions

diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 7f19f6b8427..ed1afc9efa3 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -159,7 +159,7 @@ namespace :admin do
 
   resources :labels
 
-  resources :runners, only: [:index, :show, :update, :destroy] do
+  resources :runners, only: [:index, :show, :edit, :update, :destroy] do
     member do
       post :resume
       post :pause
diff --git a/config/routes/group.rb b/config/routes/group.rb
index da205163e6d..c313f7209fb 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -43,6 +43,12 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
         post :create_deploy_token, path: 'deploy_token/create'
       end
 
+      resources :access_tokens, only: [:index, :create] do
+        member do
+          put :revoke
+        end
+      end
+
       resources :integrations, only: [:index, :edit, :update] do
         member do
           put :test
@@ -64,7 +70,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       post :toggle_subscription, on: :member
     end
 
-    resources :packages, only: [:index]
+    resources :packages, only: [:index, :show]
 
     resources :milestones, constraints: { id: %r{[^/]+} } do
       member do
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 5f1b35d67c0..702ef64a2ca 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -212,7 +212,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :services, constraints: { id: %r{[^/]+} }, only: [:edit, :update] do
+        resources :integrations, controller: :services, constraints: { id: %r{[^/]+} }, only: [:edit, :update] do
           member do
             put :test
           end
@@ -319,6 +319,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         namespace :google_cloud do
           resources :service_accounts, only: [:index, :create]
+
+          get '/deployments/cloud_run', to: 'deployments#cloud_run'
+          get '/deployments/cloud_storage', to: 'deployments#cloud_storage'
         end
 
         resources :environments, except: [:destroy] do
diff --git a/config/routes/sherlock.rb b/config/routes/sherlock.rb
deleted file mode 100644
index a9be434dba7..00000000000
--- a/config/routes/sherlock.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-if Gitlab::Sherlock.enabled?
-  namespace :sherlock do
-    resources :transactions, only: [:index, :show] do
-      resources :queries, only: [:show]
-      resources :file_samples, only: [:show]
-
-      collection do
-        delete :destroy_all
-      end
-    end
-  end
-end