diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-25 20:27:25 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-31 07:01:48 +0300 |
| commit | 2c6fc0fff6204b20ea3cdd7b8c579692ac2b0ca5 (patch) | |
| tree | 8fdecfc1ffd660306aafbd4e424f2385771c2aa3 /changelogs | |
| parent | 88d0ccd551f0334304de665ece94ba9810c60de7 (diff) | |
Merge branch 'bvl-security-9-2-28917-contain-uploads-in-system-dir' into 'security-9-2'
(security-9-2) Upload files into `public/upload/system` instead of `public/upload`
See merge request !2104
Conflicts:
app/validators/dynamic_path_validator.rb
Fixed conflicts based on 3c7c859c359bf5d3955dd300d6861ff33af21ca7
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/28917-contain-uploads-in-system-dir.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/28917-contain-uploads-in-system-dir.yml b/changelogs/unreleased/28917-contain-uploads-in-system-dir.yml new file mode 100644 index 00000000000..cddab46d815 --- /dev/null +++ b/changelogs/unreleased/28917-contain-uploads-in-system-dir.yml @@ -0,0 +1,4 @@ +--- +title: Move uploads from 'public/uploads' to 'public/uploads/system' +merge_request: +author: |