diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-20 15:37:37 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-20 15:37:37 +0100 |
| commit | 218283b368161130f43333e75629870c9649b319 (patch) | |
| tree | c266f2c98aa3b199569a482fc0a651c484dd486f /app/controllers/files_controller.rb | |
| parent | 4ef6ffaad3e9b7a29b438722e5e101de78521ec7 (diff) | |
| parent | 65b125a5035cb021aeb81e168fd4ae1ad6c74c11 (diff) | |
| download | gitlab-ce-218283b368161130f43333e75629870c9649b319.tar.gz | |
Merge branch 'extend_markdown_upload' into generic-uploads
# Conflicts:
# app/controllers/files_controller.rb
# app/controllers/projects/uploads_controller.rb
# app/uploaders/attachment_uploader.rb
Diffstat (limited to 'app/controllers/files_controller.rb')
| -rw-r--r-- | app/controllers/files_controller.rb | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb deleted file mode 100644 index 9671245d3f4..00000000000 --- a/app/controllers/files_controller.rb +++ /dev/null @@ -1,17 +0,0 @@ -class FilesController < ApplicationController - def download - note = Note.find(params[:id]) - uploader = note.attachment - - if uploader.file_storage? - if can?(current_user, :read_project, note.project) - disposition = uploader.image? ? 'inline' : 'attachment' - send_file uploader.file.path, disposition: disposition - else - not_found! - end - else - redirect_to uploader.url - end - end -end |