diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-17 20:53:09 -0600 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-17 20:53:09 -0600 |
| commit | feeffc442618d92040cd1cc38158b689a09988fd (patch) | |
| tree | b19c0ac2ddae23d830bbc69b99d920eec1f81363 /app/controllers/files_controller.rb | |
| parent | 1a9c2ddc55cf563ea42d67811a19b2693d7a44e9 (diff) | |
| parent | 5bbc70da9cb439342bdbe022988e4e734d891f44 (diff) | |
| download | gitlab-ce-feeffc442618d92040cd1cc38158b689a09988fd.tar.gz | |
Merge branch 'master' into markdown-tags
Use the latest HTML pipeline gem
Diffstat (limited to 'app/controllers/files_controller.rb')
| -rw-r--r-- | app/controllers/files_controller.rb | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb deleted file mode 100644 index 7937454810d..00000000000 --- a/app/controllers/files_controller.rb +++ /dev/null @@ -1,16 +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) - send_file uploader.file.path, disposition: 'attachment' - else - not_found! - end - else - redirect_to uploader.url - end - end -end |