summaryrefslogtreecommitdiff
path: root/app/controllers/files_controller.rb
diff options
context:
space:
mode:
authorSabba Petri <sabbap@gmail.com>2015-02-24 09:55:25 -0800
committerSabba Petri <sabbap@gmail.com>2015-02-24 09:55:25 -0800
commita33e615b471f8c9b49b1a1baf79f7380ce606790 (patch)
tree13e90fbb81aa60d8a2ee5540742d40d9438b0b99 /app/controllers/files_controller.rb
parent846f83177448832bd04ea0167b34541b5d3b71c6 (diff)
parent428df28cda4b31a70d908e612bbad627b32c3426 (diff)
downloadgitlab-ce-a33e615b471f8c9b49b1a1baf79f7380ce606790.tar.gz
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into small_profile_changes
Diffstat (limited to 'app/controllers/files_controller.rb')
-rw-r--r--app/controllers/files_controller.rb2
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