summaryrefslogtreecommitdiff
path: root/app/controllers/uploads_controller.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-10-09 20:07:29 +0300
committerValery Sizov <vsv2711@gmail.com>2015-10-13 20:12:34 +0300
commit8346dde0520ed625446ecc5d5a35b53e0b60dbb0 (patch)
treef2faa89dc934967921ddea7794a319333ea77c97 /app/controllers/uploads_controller.rb
parentfb8f604f1cdc2e114e3ebb55827353d07dd7778a (diff)
downloadgitlab-ce-8346dde0520ed625446ecc5d5a35b53e0b60dbb0.tar.gz
Only render 404 page from /publicinified_404_error
Diffstat (limited to 'app/controllers/uploads_controller.rb')
-rw-r--r--app/controllers/uploads_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 28536e359e5..868b05929d7 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -10,7 +10,7 @@ class UploadsController < ApplicationController
end
unless uploader.file && uploader.file.exists?
- return not_found!
+ return render_404
end
disposition = uploader.image? ? 'inline' : 'attachment'
@@ -21,7 +21,7 @@ class UploadsController < ApplicationController
def find_model
unless upload_model && upload_mount
- return not_found!
+ return render_404
end
@model = upload_model.find(params[:id])
@@ -44,7 +44,7 @@ class UploadsController < ApplicationController
return if authorized
if current_user
- not_found!
+ render_404
else
authenticate_user!
end