Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRegis Boudinot <boudinot.regis@yahoo.com>2017-06-08 23:06:09 +0300
committerRegis Boudinot <boudinot.regis@yahoo.com>2017-06-08 23:06:09 +0300
commitb1bf6d88fceb24663bfe4be2d9cc111710d9126b (patch)
tree9275e78a1822df870183a85a2db83f18607595c0 /config
parentaf16177707418ff9a4f96c0fee95b3788d153474 (diff)
parente0e5d097327c52e54a6e7433bbf0e350f15bf1f3 (diff)
Merge branch 'master-security-update' into 'master'
Master security update See merge request !12025
Diffstat (limited to 'config')
-rw-r--r--config/routes/uploads.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb
index ae8747d766d..a49e244af1a 100644
--- a/config/routes/uploads.rb
+++ b/config/routes/uploads.rb
@@ -1,6 +1,6 @@
scope path: :uploads do
# Note attachments and User/Group/Project avatars
- get ":model/:mounted_as/:id/:filename",
+ get "system/:model/:mounted_as/:id/:filename",
to: "uploads#show",
constraints: { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: /[^\/]+/ }
@@ -15,7 +15,7 @@ scope path: :uploads do
constraints: { filename: /[^\/]+/ }
# Appearance
- get ":model/:mounted_as/:id/:filename",
+ get "system/:model/:mounted_as/:id/:filename",
to: "uploads#show",
constraints: { model: /appearance/, mounted_as: /logo|header_logo/, filename: /.+/ }