features · c3f68f9032b2548c4a5956f9e4b1a69306020faf · Forest Godfrey / gitlab-ce

Merge branch 'bvl-security-9-2-28917-contain-uploads-in-system-dir' into 'security-9-2' · 2c6fc0ff

authored May 25, 2017

(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

2c6fc0ff

Name	Last commit	Last update
..
dashboard		Loading commit data...
explore		Loading commit data...
group		Loading commit data...
profile		Loading commit data...
project		Loading commit data...
snippets		Loading commit data...
steps		Loading commit data...
support		Loading commit data...
groups.feature		Loading commit data...
invites.feature		Loading commit data...
search.feature		Loading commit data...
user.feature		Loading commit data...