diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-06-27 10:53:06 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-07-19 22:28:27 -0500 |
| commit | 88df076fae9568314473de5fa6a0086c33663869 (patch) | |
| tree | c550f1809aa781e94304ca467388c487945cc302 /config/routes/uploads.rb | |
| parent | 3a7b724f6a03a19719b05b30e1e76e536230bcca (diff) | |
| download | gitlab-ce-88df076fae9568314473de5fa6a0086c33663869.tar.gz | |
Merge branch '33359-pers-snippet-files-location' into 'security-9-3'
Use uploads/system directory for personal snippets
See merge request !2123
Diffstat (limited to 'config/routes/uploads.rb')
| -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 ed5476c8f71..e9c9aa8b2f9 100644 --- a/config/routes/uploads.rb +++ b/config/routes/uploads.rb @@ -5,12 +5,12 @@ scope path: :uploads do constraints: { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: /[^\/]+/ } # show uploads for models, snippets (notes) available for now - get ':model/:id/:secret/:filename', + get 'system/:model/:id/:secret/:filename', to: 'uploads#show', constraints: { model: /personal_snippet/, id: /\d+/, filename: /[^\/]+/ } # show temporary uploads - get 'temp/:secret/:filename', + get 'system/temp/:secret/:filename', to: 'uploads#show', constraints: { filename: /[^\/]+/ } |