Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 7 deletions

diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb
index ba2e8493ef9..7b598e84975 100644
--- a/config/routes/uploads.rb
+++ b/config/routes/uploads.rb
@@ -22,13 +22,6 @@ scope path: :uploads do
       constraints: { model: /appearance/, mounted_as: /logo|header_logo|favicon/, filename: /.+/ },
       as: 'appearance_upload'
 
-  # Project markdown uploads
-  # DEPRECATED: Remove this in GitLab 13.0 because this is redundant to show_namespace_project_uploads
-  # https://gitlab.com/gitlab-org/gitlab/issues/196396
-  get ":namespace_id/:project_id/:secret/:filename",
-    to: redirect("%{namespace_id}/%{project_id}/uploads/%{secret}/%{filename}"),
-    constraints: { namespace_id: /[a-zA-Z.0-9_\-]+/, project_id: /[a-zA-Z.0-9_\-]+/, filename: %r{[^/]+} }, format: false, defaults: { format: nil }
-
   # create uploads for models, snippets (notes) available for now
   post ':model',
     to: 'uploads#create',