summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-12-25 00:24:00 -0800
committerStan Hu <stanhu@gmail.com>2018-12-25 08:22:34 -0800
commit7036f75f6710d5b2cb188864c3c75e06721a755f (patch)
tree75d10c9f6ed4e332a3dec12ebb63e04b1f4a60b2 /config
parent5dc656fc1f053d397ad1e6c1d85a815f03a5d634 (diff)
downloadgitlab-ce-7036f75f6710d5b2cb188864c3c75e06721a755f.tar.gz
Use system paths for appearance logos
When object storage is enabled, the logos used to customize a GitLab appearance causes the time-limited URLs to be used. We fix this by forcing all of these URLs to use the /uploads/-/system prefix so that they will always be proxied through GitLab. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6778
Diffstat (limited to 'config')
-rw-r--r--config/routes/uploads.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb
index 6becadd57ae..b594f55f8a0 100644
--- a/config/routes/uploads.rb
+++ b/config/routes/uploads.rb
@@ -17,7 +17,8 @@ scope path: :uploads do
# Appearance
get "-/system/:model/:mounted_as/:id/:filename",
to: "uploads#show",
- constraints: { model: /appearance/, mounted_as: /logo|header_logo|favicon/, filename: /.+/ }
+ constraints: { model: /appearance/, mounted_as: /logo|header_logo|favicon/, filename: /.+/ },
+ as: 'appearance_upload'
# Project markdown uploads
get ":namespace_id/:project_id/:secret/:filename",