diff options
| author | Han Loong Liauw <hanloongliauw@gmail.com> | 2015-10-17 09:30:43 +1100 |
|---|---|---|
| committer | Han Loong Liauw <hanloongliauw@gmail.com> | 2015-10-17 09:30:43 +1100 |
| commit | 1565a95da17ba8425486839d0712a9141d66b98f (patch) | |
| tree | d2a9d3afaf90b12c1a71fa8c82ac168becd5c75b /app/controllers/uploads_controller.rb | |
| parent | 45e11d95f27584f699392fad8f54c1807e562d7f (diff) | |
| parent | c856a7a5934fba13598be09507c2090888f57a39 (diff) | |
| download | gitlab-ce-1565a95da17ba8425486839d0712a9141d66b98f.tar.gz | |
Merge branch 'master' into add-dates-snippets-show
Diffstat (limited to 'app/controllers/uploads_controller.rb')
| -rw-r--r-- | app/controllers/uploads_controller.rb | 6 |
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 |