config · dd4c4432d572d78b263867e4ef131c4f6e9f363b · 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
..
environments		Loading commit data...
initializers		Loading commit data...
locales		Loading commit data...
routes		Loading commit data...
README.md		Loading commit data...
application.rb		Loading commit data...
aws.yml.example		Loading commit data...
boot.rb		Loading commit data...
database.yml.env		Loading commit data...
database.yml.mysql		Loading commit data...
database.yml.postgresql		Loading commit data...
dependency_decisions.yml		Loading commit data...
environment.rb		Loading commit data...
gitlab.yml.example		Loading commit data...
karma.config.js		Loading commit data...
license_finder.yml		Loading commit data...
mail_room.yml		Loading commit data...
no_todos_messages.yml		Loading commit data...
resque.yml.example		Loading commit data...
routes.rb		Loading commit data...
secrets.yml.example		Loading commit data...
sidekiq.yml.example		Loading commit data...
sidekiq_queues.yml		Loading commit data...
unicorn.rb.example		Loading commit data...
unicorn.rb.example.development		Loading commit data...
webpack.config.js		Loading commit data...

README.md