From bc2f7ab125361e4180018b1b933f42a8709df356 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 13 Oct 2021 09:11:55 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/routes/admin.rb | 7 +++++++ config/routes/uploads.rb | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'config/routes') diff --git a/config/routes/admin.rb b/config/routes/admin.rb index a17059c0265..dac1937b76a 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -61,6 +61,13 @@ namespace :admin do end end + resources :topics, only: [:index, :new, :create, :edit, :update] do + resource :avatar, controller: 'topics/avatars', only: [:destroy] + collection do + post :preview_markdown + end + end + resources :deploy_keys, only: [:index, :new, :create, :edit, :update, :destroy] resources :hooks, only: [:index, :create, :edit, :update, :destroy] do diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb index 71a868175a9..e2cdf8ba606 100644 --- a/config/routes/uploads.rb +++ b/config/routes/uploads.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true scope path: :uploads do - # Note attachments and User/Group/Project avatars + # Note attachments and User/Group/Project/Topic avatars get "-/system/:model/:mounted_as/:id/:filename", to: "uploads#show", - constraints: { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: %r{[^/]+} } + constraints: { model: %r{note|user|group|project|projects\/topic}, mounted_as: /avatar|attachment/, filename: %r{[^/]+} } # show uploads for models, snippets (notes) available for now get '-/system/:model/:id/:secret/:filename', -- cgit v1.2.3