diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-24 11:51:08 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-24 11:51:08 -0800 |
commit | ecb12f211150f30383a8aadedebcdcc845adf39a (patch) | |
tree | e3fcabe8bacc0a34c018c9a24a2cb7bd9c119b8a /app/controllers/files_controller.rb | |
parent | 63c4f3ca7665d076ea143991823ec99c8f996a73 (diff) | |
parent | 75048fcd6917cfc25795bcca0929d442f9c65be4 (diff) | |
download | gitlab-ce-ecb12f211150f30383a8aadedebcdcc845adf39a.tar.gz |
Merge branch 'master' into update_grack
Conflicts:
Gemfile.lock
Diffstat (limited to 'app/controllers/files_controller.rb')
-rw-r--r-- | app/controllers/files_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 9671245d3f4..a130bcba9c9 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -1,4 +1,6 @@ class FilesController < ApplicationController + skip_before_filter :authenticate_user!, :reject_blocked + def download note = Note.find(params[:id]) uploader = note.attachment |