From c177cc0ebd68b4f458a440097451bbe2ff52bf34 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 11 Feb 2021 16:14:50 +0200 Subject: [PATCH 1/3] Redirect deprecated pipeline routes Redirect unscoped pipeline routes like group/project/pipelines to the scoped one like group/project/-/pipelines Signed-off-by: Dmitriy Zaporozhets --- config/routes/project.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes/project.rb b/config/routes/project.rb index 21dfe17371530a..54fc735e497017 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -553,7 +553,6 @@ # Deprecated unscoped routing. scope as: 'deprecated' do # Issue https://gitlab.com/gitlab-org/gitlab/issues/118849 - draw :pipelines draw :repository # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/29572 @@ -576,7 +575,8 @@ :environments, :protected_environments, :error_tracking, :alert_management, :tracing, :serverless, :clusters, :audit_events, :wikis, :merge_requests, - :vulnerability_feedback, :security, :dependencies, :issues) + :vulnerability_feedback, :security, :dependencies, :issues, + :pipelines, :pipeline_schedules) end # rubocop: disable Cop/PutProjectRoutesUnderScope -- GitLab From 065872b13974fd40cb218188e3234bd378a52274 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 11 Feb 2021 18:12:19 +0200 Subject: [PATCH 2/3] Add specs for pipeline routing Signed-off-by: Dmitriy Zaporozhets --- ee/spec/routing/project_routing_spec.rb | 2 +- spec/routing/project_routing_spec.rb | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ee/spec/routing/project_routing_spec.rb b/ee/spec/routing/project_routing_spec.rb index 4a6735fad0579e..2ceda31b35b2ce 100644 --- a/ee/spec/routing/project_routing_spec.rb +++ b/ee/spec/routing/project_routing_spec.rb @@ -37,7 +37,7 @@ # security_namespace_project_pipeline GET /:project_id/pipelines/:id/security(.:format) describe Projects::PipelinesController, 'routing' do it 'to #security' do - expect(get('/gitlab/gitlabhq/pipelines/12/security')).to route_to('projects/pipelines#security', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '12') + expect(get('/gitlab/gitlabhq/-/pipelines/12/security')).to route_to('projects/pipelines#security', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '12') end end diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index f7ed8d7d5dc634..c9b6400d585cb8 100644 --- a/spec/routing/project_routing_spec.rb +++ b/spec/routing/project_routing_spec.rb @@ -700,6 +700,26 @@ end end + describe Projects::PipelinesController, 'routing' do + it 'to #index' do + expect(get('/gitlab/gitlabhq/-/pipelines')).to route_to('projects/pipelines#index', namespace_id: 'gitlab', project_id: 'gitlabhq') + end + + it 'to #show' do + expect(get('/gitlab/gitlabhq/-/pipelines/12')).to route_to('projects/pipelines#show', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '12') + end + + it_behaves_like 'redirecting a legacy path', '/gitlab/gitlabhq/pipelines', '/gitlab/gitlabhq/-/pipelines' + end + + describe Projects::PipelineSchedulesController, 'routing' do + it 'to #index' do + expect(get('/gitlab/gitlabhq/-/pipeline_schedules')).to route_to('projects/pipeline_schedules#index', namespace_id: 'gitlab', project_id: 'gitlabhq') + end + + it_behaves_like 'redirecting a legacy path', '/gitlab/gitlabhq/pipeline_schedules', '/gitlab/gitlabhq/-/pipeline_schedules' + end + describe Projects::Settings::OperationsController, 'routing' do it 'to #reset_alerting_token' do expect(post('/gitlab/gitlabhq/-/settings/operations/reset_alerting_token')).to route_to('projects/settings/operations#reset_alerting_token', namespace_id: 'gitlab', project_id: 'gitlabhq') -- GitLab From 38993a240c92bfe700819aabf85096683fa0daed Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 15 Feb 2021 18:16:44 +0200 Subject: [PATCH 3/3] Add changelog for pipeline routing Signed-off-by: Dmitriy Zaporozhets --- .../unreleased/dz-redirect-deprecated-pipeline-routes.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/dz-redirect-deprecated-pipeline-routes.yml diff --git a/changelogs/unreleased/dz-redirect-deprecated-pipeline-routes.yml b/changelogs/unreleased/dz-redirect-deprecated-pipeline-routes.yml new file mode 100644 index 00000000000000..3ed396213bd857 --- /dev/null +++ b/changelogs/unreleased/dz-redirect-deprecated-pipeline-routes.yml @@ -0,0 +1,5 @@ +--- +title: Redirect deprecated pipeline routes +merge_request: 53990 +author: +type: removed -- GitLab