spec/migrations · 84feda4bbe8b6990927bb44435f181be4344c846 · 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
..
active_record		Loading commit data...
clean_upload_symlinks_spec.rb		Loading commit data...
fill_authorized_projects_spec.rb		Loading commit data...
fix_wrongly_renamed_routes_spec.rb		Loading commit data...
migrate_build_events_to_pipeline_events_spec.rb		Loading commit data...
migrate_process_commit_worker_jobs_spec.rb		Loading commit data...
migrate_user_activities_to_users_last_activity_on_spec.rb		Loading commit data...
migrate_user_project_view_spec.rb		Loading commit data...
move_uploads_to_system_dir_spec.rb		Loading commit data...
remove_dot_git_from_usernames_spec.rb		Loading commit data...
rename_more_reserved_project_names_spec.rb		Loading commit data...
rename_reserved_project_names_spec.rb		Loading commit data...
rename_system_namespaces_spec.rb		Loading commit data...
rename_users_with_renamed_namespace_spec.rb		Loading commit data...
update_retried_for_ci_builds_spec.rb		Loading commit data...
update_upload_paths_to_system_spec.rb		Loading commit data...