Commit eef6f768 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Add network and graphs to legacy routes too

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 6d3f5a33
...@@ -507,7 +507,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do ...@@ -507,7 +507,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
constraints: { project_id: Gitlab::PathRegex.project_route_regex }, constraints: { project_id: Gitlab::PathRegex.project_route_regex },
module: :projects, module: :projects,
as: :project) do as: :project) do
Gitlab::Routing.redirect_legacy_paths(self, :settings, :branches, :tags) Gitlab::Routing.redirect_legacy_paths(self, :settings, :branches, :tags, :network, :graphs)
end end
end end
end end
...@@ -609,6 +609,8 @@ describe 'project routing' do ...@@ -609,6 +609,8 @@ describe 'project routing' do
expect(get('/gitlab/gitlabhq/-/graphs/ends-with.json')).to route_to('projects/graphs#show', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'ends-with.json') expect(get('/gitlab/gitlabhq/-/graphs/ends-with.json')).to route_to('projects/graphs#show', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'ends-with.json')
expect(get('/gitlab/gitlabhq/-/graphs/master?format=json')).to route_to('projects/graphs#show', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'master', format: 'json') expect(get('/gitlab/gitlabhq/-/graphs/master?format=json')).to route_to('projects/graphs#show', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'master', format: 'json')
end end
it_behaves_like 'redirecting a legacy project path', "/gitlab/gitlabhq/graphs/master", "/gitlab/gitlabhq/-/graphs/master"
end end
describe Projects::ForksController, 'routing' do describe Projects::ForksController, 'routing' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment