From e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 Apr 2020 01:43:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@12-10-stable-ee --- config/routes/group.rb | 4 ++++ config/routes/project.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/routes/group.rb b/config/routes/group.rb index 3186a01d073..9571d70d103 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -32,6 +32,10 @@ constraints(::Constraints::GroupUrlConstrainer.new) do resource :ci_cd, only: [:show, :update], controller: 'ci_cd' do put :reset_registration_token patch :update_auto_devops + post :create_deploy_token, path: 'deploy_token/create', to: 'repository#create_deploy_token' + end + + resource :repository, only: [:show], controller: 'repository' do post :create_deploy_token, path: 'deploy_token/create' end diff --git a/config/routes/project.rb b/config/routes/project.rb index 1ce889dd578..29e83b8dd5d 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -73,7 +73,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :ci_cd, only: [:show, :update], controller: 'ci_cd' do post :reset_cache put :reset_registration_token - post :create_deploy_token, path: 'deploy_token/create' + post :create_deploy_token, path: 'deploy_token/create', to: 'repository#create_deploy_token' end resource :operations, only: [:show, :update] do @@ -87,7 +87,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :repository, only: [:show], controller: :repository do # TODO: Removed this "create_deploy_token" route after change was made in app/helpers/ci_variables_helper.rb:14 # See MR comment for more detail: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27059#note_311585356 - post :create_deploy_token, path: 'deploy_token/create', to: 'ci_cd#create_deploy_token' + post :create_deploy_token, path: 'deploy_token/create' post :cleanup end end -- cgit v1.2.3