Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 1 deletions

diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index c92484316e4..116c607c2cb 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -121,7 +121,7 @@ namespace :admin do
     get '/', to: redirect('admin/application_settings/general'), as: nil
 
     resources :services, only: [:index, :edit, :update]
-    resources :integrations, only: [:edit, :update, :test] do
+    resources :integrations, only: [:edit, :update] do
       member do
         put :test
       end
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 1d51b3fb6fe..97d339fea98 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -31,6 +31,12 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
         patch :update_auto_devops
         post :create_deploy_token, path: 'deploy_token/create'
       end
+
+      resources :integrations, only: [:index, :edit, :update] do
+        member do
+          put :test
+        end
+      end
     end
 
     resource :variables, only: [:show, :update]