diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-09-01 16:20:29 +0100 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:34 -0500 |
| commit | 241cca011f9a35c03e8f5fae1381a4af8a8f26bb (patch) | |
| tree | 6409c27353c24032fb17959cf08554ef49554f84 /app/controllers/application_controller.rb | |
| parent | 9727366b5a0a39a125925e2a7a78ed47e29b02f7 (diff) | |
| download | gitlab-ce-241cca011f9a35c03e8f5fae1381a4af8a8f26bb.tar.gz | |
Fix specs
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bf37421771f..81c0fa26d18 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -115,10 +115,10 @@ class ApplicationController < ActionController::Base def render_404 respond_to do |format| - format.json { head :not_found } - format.any do + format.html do render file: Rails.root.join("public", "404"), layout: false, status: "404" end + format.any { head :not_found } end end |