Commit 27a6aa4f authored by Bob Van Landuyt's avatar Bob Van Landuyt

Move system-uploads to `-/system`

parent 11f9ac0a
...@@ -16,7 +16,7 @@ class GitlabUploader < CarrierWave::Uploader::Base ...@@ -16,7 +16,7 @@ class GitlabUploader < CarrierWave::Uploader::Base
def self.base_dir def self.base_dir
return root_dir unless file_storage? return root_dir unless file_storage?
File.join(root_dir, 'system') File.join(root_dir, '-', 'system')
end end
def self.file_storage? def self.file_storage?
......
---
title: "Move uploads from `uploads/system` to `uploads/-/system` to free up `system` as a group name"
merge_request: 11713
author:
scope path: :uploads do scope path: :uploads do
# Note attachments and User/Group/Project avatars # Note attachments and User/Group/Project avatars
get "system/:model/:mounted_as/:id/:filename", get "-/system/:model/:mounted_as/:id/:filename",
to: "uploads#show", to: "uploads#show",
constraints: { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: /[^\/]+/ } constraints: { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: /[^\/]+/ }
...@@ -15,7 +15,7 @@ scope path: :uploads do ...@@ -15,7 +15,7 @@ scope path: :uploads do
constraints: { filename: /[^\/]+/ } constraints: { filename: /[^\/]+/ }
# Appearance # Appearance
get "system/:model/:mounted_as/:id/:filename", get "-/system/:model/:mounted_as/:id/:filename",
to: "uploads#show", to: "uploads#show",
constraints: { model: /appearance/, mounted_as: /logo|header_logo/, filename: /.+/ } constraints: { model: /appearance/, mounted_as: /logo|header_logo/, filename: /.+/ }
......
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