diff options
Diffstat (limited to 'config/routes/project.rb')
| -rw-r--r-- | config/routes/project.rb | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 09e6b733bff..f85267b66b3 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -281,6 +281,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end + draw :merge_requests + # The wiki and repository routing contains wildcard characters so # its preferable to keep it below all other project routes draw :repository_scoped @@ -339,17 +341,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - # Unscoped route. It will be replaced with redirect to /-/merge_requests/ - # Issue https://gitlab.com/gitlab-org/gitlab/issues/118849 - draw :merge_requests - - # To ensure an old unscoped routing is used for the UI we need to - # add prefix 'as' to the scope routing and place it below original MR routing. - # Issue https://gitlab.com/gitlab-org/gitlab/issues/118849 - scope '-', as: 'scoped' do - draw :merge_requests - end - resources :pipelines, only: [:index, :new, :create, :show, :destroy] do collection do resource :pipelines_settings, path: 'settings', only: [:show, :update] @@ -510,7 +501,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do :forks, :group_links, :import, :avatar, :mirror, :cycle_analytics, :mattermost, :variables, :triggers, :environments, :protected_environments, :error_tracking, - :serverless, :clusters, :audit_events, :wikis) + :serverless, :clusters, :audit_events, :wikis, :merge_requests) end # rubocop: disable Cop/PutProjectRoutesUnderScope |