diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 16:54:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 16:54:15 +0300 |
commit | be834a25982746ffd85252ff502df42bb88cb9d5 (patch) | |
tree | b4d6a8ba0931e12fac08f05abea33a3b8ec2c8a2 /config/routes/project.rb | |
parent | ee925a3597f27e92f83a50937a64068109675b3d (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc32
Diffstat (limited to 'config/routes/project.rb')
-rw-r--r-- | config/routes/project.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 24b44646d95..c8fd5dc7e9e 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -93,6 +93,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do post :reset_cache put :reset_registration_token post :create_deploy_token, path: 'deploy_token/create', to: 'repository#create_deploy_token' + get :runner_setup_scripts, format: :json end resource :operations, only: [:show, :update] do @@ -161,8 +162,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :milestones, constraints: { id: /\d+/ } do member do post :promote - put :sort_issues - put :sort_merge_requests + get :issues get :merge_requests get :participants get :labels @@ -311,6 +311,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :incidents, only: [:index] + get 'issues/incident/:id' => 'incidents#show', as: :issues_incident + namespace :error_tracking do resources :projects, only: :index end |