diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 21:09:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 21:09:07 +0300 |
commit | 1c8fa70f9d0818e2a82089c8643a6e455bca47fd (patch) | |
tree | f339f97de0425270bdd909e2f4d378927b6e0a18 /config/routes | |
parent | 736d36d8597d0d1ec1b47644e6d091c3f4a78f45 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes')
-rw-r--r-- | config/routes/group.rb | 7 | ||||
-rw-r--r-- | config/routes/project.rb | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index 68e239faf6d..1d51b3fb6fe 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -29,6 +29,7 @@ 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' end end @@ -49,6 +50,12 @@ constraints(::Constraints::GroupUrlConstrainer.new) do end end + resources :deploy_tokens, constraints: { id: /\d+/ }, only: [] do + member do + put :revoke + end + end + resource :avatar, only: [:destroy] concerns :clusterable diff --git a/config/routes/project.rb b/config/routes/project.rb index aa2410d8e00..cff075b260f 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -79,7 +79,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :integrations, only: [:show] resource :repository, only: [:show], controller: :repository do - post :create_deploy_token, path: 'deploy_token/create' + # TODO: Move 'create_deploy_token' here to the ':ci_cd' resource above during 12.9. + # More details here: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24102#note_287572556 + post :create_deploy_token, path: 'deploy_token/create', to: 'ci_cd#create_deploy_token' post :cleanup end end |