diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-23 18:10:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-23 18:10:34 +0300 |
commit | a8b96c3072b3bd4d45e6364931042b350bf7fa2e (patch) | |
tree | 70d8a5faa2171c82a0007364f89c11d2e45aeac5 /config | |
parent | 8137303e47baaff97a36396cfb05efc0d99879a2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/issues.rb | 6 | ||||
-rw-r--r-- | config/routes/project.rb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/routes/issues.rb b/config/routes/issues.rb index cc4399693ed..25e59022272 100644 --- a/config/routes/issues.rb +++ b/config/routes/issues.rb @@ -21,6 +21,12 @@ resources :issues, concerns: :awardable, constraints: { id: /\d+/ } do post :bulk_update post :import_csv post :export_csv + + scope :incident do + get '/:id', + to: 'incidents#show', + as: :incident + end end resources :issue_links, only: [:index, :create, :destroy], as: 'links', path: 'links' diff --git a/config/routes/project.rb b/config/routes/project.rb index 798829484da..eb7950694aa 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -375,8 +375,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - get 'issues/incident/:id' => 'incidents#show', as: :issues_incident - namespace :error_tracking do resources :projects, only: :index end |