diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-19 08:57:33 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-19 08:57:33 -0800 |
| commit | 7c3147e6e969a7ae97e2f8d05e536abeeb7d3936 (patch) | |
| tree | 9b341b6638b252520c237ff72b6fbde4b6fbd1dd /app/controllers | |
| parent | 3c2139ed172c607467ec6cf412d7ed33147bac22 (diff) | |
| download | gitlab-ce-7c3147e6e969a7ae97e2f8d05e536abeeb7d3936.tar.gz | |
Revert "Nitpicking."
This reverts commit ebd39fc082b09177e0777e5de5729c3f98495e87.
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/files_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 15523cbc2e7..561af8084c3 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -5,10 +5,9 @@ class FilesController < ApplicationController if uploader.file_storage? if can?(current_user, :read_project, note.project) - # Replace old notes location in /public with the new one in / and send the file - path = uploader.file.path.gsub("#{Rails.root}/public", Rails.root.to_s) - disposition = uploader.image? ? 'inline' : 'attachment' + # Replace old notes location in /public with the new one in / and send the file + path = uploader.file.path.gsub("#{Rails.root}/public",Rails.root.to_s) send_file path, disposition: disposition else not_found! |