delta/gitlab/gitlab-ce.git/app/controllers/projects/uploads_controller.rb, branch shell-version-warning gitlab.com: gitlab-org/gitlab-ce.git Fix URL to uploaded file. 2015-02-20T15:01:37+00:00 Douwe Maan douwe@gitlab.com 2015-02-20T14:56:12+00:00 7f1adc3d9cdc5c3f1c0fcbf6c72d89b8ee062af5 






Merge branch 'extend_markdown_upload' into generic-uploads
2015-02-20T14:37:37+00:00

Douwe Maan
douwe@gitlab.com

2015-02-20T14:37:37+00:00

218283b368161130f43333e75629870c9649b319

# Conflicts:
#	app/controllers/files_controller.rb
#	app/controllers/projects/uploads_controller.rb
#	app/uploaders/attachment_uploader.rb





# Conflicts:
#	app/controllers/files_controller.rb
#	app/controllers/projects/uploads_controller.rb
#	app/uploaders/attachment_uploader.rb







Satisfy Rubocop.
2015-02-20T13:39:35+00:00

Douwe Maan
douwe@gitlab.com

2015-02-20T13:39:35+00:00

c801df81fb48272b670b7448e3898a98cdb8b742












Use controllers to serve uploads, with XSS prevention and access control.
2015-02-20T12:13:48+00:00

Douwe Maan
douwe@gitlab.com

2015-02-20T12:13:48+00:00

00ca490259de684f4240de4f61728b8eaefbb13e












Refactor.
2015-02-17T21:23:31+00:00

Douwe Maan
douwe@gitlab.com

2015-02-16T18:58:40+00:00

d2ebdf664b42d4fac6b2e060ef79aa9fe0b0e72d












implement Project::UploadsController
2015-02-17T21:21:13+00:00

Hannes Rosenögger
123haynes@gmail.com

2015-02-14T18:52:45+00:00

9729cc584f5758395960416f308a9c45f698cdee