diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-09-07 21:47:52 +0400 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-09-07 21:47:52 +0400 |
| commit | 367e17cc84bd432117f283d2e858a29d033e979f (patch) | |
| tree | bae138ce5a254b3f0245ed779451a39752e76209 /app | |
| parent | e8f39a0a61c4c91b8a5dc016474b6139a79a52e8 (diff) | |
5xx error status code for gitolite & encoding error
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/errors/encoding.html.haml | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2fe2a97460f..a0040298a15 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -11,11 +11,11 @@ class ApplicationController < ActionController::Base helper_method :abilities, :can? rescue_from Gitlab::Gitolite::AccessDenied do |exception| - render "errors/gitolite", layout: "error" + render "errors/gitolite", layout: "error", status: 500 end rescue_from Encoding::CompatibilityError do |exception| - render "errors/encoding", layout: "error", status: 404 + render "errors/encoding", layout: "error", status: 500 end rescue_from ActiveRecord::RecordNotFound do |exception| diff --git a/app/views/errors/encoding.html.haml b/app/views/errors/encoding.html.haml index 4662437f2d2..d7b5e68e870 100644 --- a/app/views/errors/encoding.html.haml +++ b/app/views/errors/encoding.html.haml @@ -1,5 +1,3 @@ -.alert-message.block-message.error - %h3 Encoding Error - %hr - %p - Page can't be loaded because of an encoding error. +%h1 Encoding Error +%hr +%p Page can't be loaded because of an encoding error. |