diff options
author | Regis Boudinot <boudinot.regis@yahoo.com> | 2017-06-08 20:06:09 +0000 |
---|---|---|
committer | Regis Boudinot <boudinot.regis@yahoo.com> | 2017-06-08 20:06:09 +0000 |
commit | b1bf6d88fceb24663bfe4be2d9cc111710d9126b (patch) | |
tree | 9275e78a1822df870183a85a2db83f18607595c0 /config | |
parent | af16177707418ff9a4f96c0fee95b3788d153474 (diff) | |
parent | e0e5d097327c52e54a6e7433bbf0e350f15bf1f3 (diff) | |
download | gitlab-ce-b1bf6d88fceb24663bfe4be2d9cc111710d9126b.tar.gz |
Merge branch 'master-security-update' into 'master'
Master security update
See merge request !12025
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/uploads.rb | 4 |
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: /.+/ } |