diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-19 12:09:15 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-19 12:09:15 +0300 |
| commit | fca7a77a23ac6e1723a6449287f731634d735b23 (patch) | |
| tree | be38574351cde1b0121630517693efeeaba48aef /config | |
| parent | 045e4de472b70754070f63abdf1f6a8397432435 (diff) | |
| parent | 6f26f6f79f33fdb7e4e556b7f6b37999b78cd323 (diff) | |
Merge branch 'bvl-free-system-namespace' into 'master'
Free `system` namespace by moving uploads into `uploads/-`
Closes #33550
See merge request !12917
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 a49e244af1a..ed5476c8f71 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 "system/: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 "system/:model/:mounted_as/:id/:filename", + get "-/system/:model/:mounted_as/:id/:filename", to: "uploads#show", constraints: { model: /appearance/, mounted_as: /logo|header_logo/, filename: /.+/ } |