From a9688b34eac07f9c6b9cb3ff6ff61df402e5dd25 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 18 Jun 2020 18:53:02 +0300 Subject: [PATCH] Remove some deprecated global routes Remove deprecated /abuse_reports, /invites, /sent_notifications, /autocomplete routes. Signed-off-by: Dmitriy Zaporozhets --- .../dz-remove-deprecated-global-routes.yml | 5 +++ config/routes.rb | 32 ------------------- doc/user/reserved_names.md | 4 --- lib/gitlab/path_regex.rb | 4 --- spec/lib/gitlab/path_regex_spec.rb | 2 +- spec/routing/routing_spec.rb | 14 -------- 6 files changed, 6 insertions(+), 55 deletions(-) create mode 100644 changelogs/unreleased/dz-remove-deprecated-global-routes.yml diff --git a/changelogs/unreleased/dz-remove-deprecated-global-routes.yml b/changelogs/unreleased/dz-remove-deprecated-global-routes.yml new file mode 100644 index 00000000000000..7e0df5eac95e9c --- /dev/null +++ b/changelogs/unreleased/dz-remove-deprecated-global-routes.yml @@ -0,0 +1,5 @@ +--- +title: Remove some deprecated global routes +merge_request: 34295 +author: +type: removed diff --git a/config/routes.rb b/config/routes.rb index 3b0370551b9a61..2f0dcc3b856e85 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -252,38 +252,6 @@ end end - # Deprecated routes. - # Will be removed as part of https://gitlab.com/gitlab-org/gitlab/-/issues/210024 - scope as: :deprecated do - # Autocomplete - get '/autocomplete/users' => 'autocomplete#users' - get '/autocomplete/users/:id' => 'autocomplete#user' - get '/autocomplete/projects' => 'autocomplete#projects' - get '/autocomplete/award_emojis' => 'autocomplete#award_emojis' - get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches' - - Gitlab.ee do - get '/autocomplete/project_groups' => 'autocomplete#project_groups' - get '/autocomplete/project_routes' => 'autocomplete#project_routes' - get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes' - end - - resources :invites, only: [:show], constraints: { id: /[A-Za-z0-9_-]+/ } do - member do - post :accept - match :decline, via: [:get, :post] - end - end - - resources :sent_notifications, only: [], constraints: { id: /\h{32}/ } do - member do - get :unsubscribe - end - end - - resources :abuse_reports, only: [:new, :create] - end - resources :groups, only: [:index, :new, :create] do post :preview_markdown end diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md index 16ff853863079e..d00d60b8e8ee98 100644 --- a/doc/user/reserved_names.md +++ b/doc/user/reserved_names.md @@ -54,13 +54,11 @@ Currently the following names are reserved as top level groups: - `500.html` - `502.html` - `503.html` -- `abuse_reports` - `admin` - `api` - `apple-touch-icon-precomposed.png` - `apple-touch-icon.png` - `assets` -- `autocomplete` - `dashboard` - `deploy.html` - `explore` @@ -71,7 +69,6 @@ Currently the following names are reserved as top level groups: - `health_check` - `help` - `import` -- `invites` - `jwt` - `login` - `oauth` @@ -81,7 +78,6 @@ Currently the following names are reserved as top level groups: - `robots.txt` - `s` - `search` -- `sent_notifications` - `sitemap` - `sitemap.xml` - `sitemap.xml.gz` diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index 8618d2da77c18a..16a6c470213c50 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -21,13 +21,11 @@ module PathRegex 500.html 502.html 503.html - abuse_reports admin api apple-touch-icon-precomposed.png apple-touch-icon.png assets - autocomplete dashboard deploy.html explore @@ -38,7 +36,6 @@ module PathRegex health_check help import - invites jwt login oauth @@ -48,7 +45,6 @@ module PathRegex robots.txt s search - sent_notifications sitemap sitemap.xml sitemap.xml.gz diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb index cd89674af0f717..957a680189ec81 100644 --- a/spec/lib/gitlab/path_regex_spec.rb +++ b/spec/lib/gitlab/path_regex_spec.rb @@ -183,7 +183,7 @@ def failure_message(constant_name, migration_helper, missing_words: [], addition # We ban new items in this list, see https://gitlab.com/gitlab-org/gitlab/-/issues/215362 it 'does not allow expansion' do - expect(described_class::TOP_LEVEL_ROUTES.size).to eq(44) + expect(described_class::TOP_LEVEL_ROUTES.size).to eq(40) end end diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index 7b9ba7838851c3..69c0ae7a945e85 100644 --- a/spec/routing/routing_spec.rb +++ b/spec/routing/routing_spec.rb @@ -335,10 +335,6 @@ it 'to #show' do expect(get("/-/invites/#{member.invite_token}")).to route_to('invites#show', id: member.invite_token) end - - it 'to legacy route' do - expect(get("/invites/#{member.invite_token}")).to route_to('invites#show', id: member.invite_token) - end end RSpec.describe AbuseReportsController, 'routing' do @@ -347,10 +343,6 @@ it 'to #new' do expect(get("/-/abuse_reports/new?user_id=#{user.id}")).to route_to('abuse_reports#new', user_id: user.id.to_s) end - - it 'to legacy route' do - expect(get("/abuse_reports/new?user_id=#{user.id}")).to route_to('abuse_reports#new', user_id: user.id.to_s) - end end RSpec.describe SentNotificationsController, 'routing' do @@ -376,12 +368,6 @@ it 'to #merge_request_target_branches' do expect(get("/-/autocomplete/merge_request_target_branches")).to route_to('autocomplete#merge_request_target_branches') end - - it 'to legacy route' do - expect(get("/autocomplete/users")).to route_to('autocomplete#users') - expect(get("/autocomplete/projects")).to route_to('autocomplete#projects') - expect(get("/autocomplete/award_emojis")).to route_to('autocomplete#award_emojis') - end end RSpec.describe Snippets::BlobsController, "routing" do -- GitLab