Commit 367e17cc authored by randx's avatar randx

5xx error status code for gitolite & encoding error

parent e8f39a0a
...@@ -11,11 +11,11 @@ class ApplicationController < ActionController::Base ...@@ -11,11 +11,11 @@ class ApplicationController < ActionController::Base
helper_method :abilities, :can? helper_method :abilities, :can?
rescue_from Gitlab::Gitolite::AccessDenied do |exception| rescue_from Gitlab::Gitolite::AccessDenied do |exception|
render "errors/gitolite", layout: "error" render "errors/gitolite", layout: "error", status: 500
end end
rescue_from Encoding::CompatibilityError do |exception| rescue_from Encoding::CompatibilityError do |exception|
render "errors/encoding", layout: "error", status: 404 render "errors/encoding", layout: "error", status: 500
end end
rescue_from ActiveRecord::RecordNotFound do |exception| rescue_from ActiveRecord::RecordNotFound do |exception|
......
.alert-message.block-message.error %h1 Encoding Error
%h3 Encoding Error %hr
%hr %p Page can't be loaded because of an encoding error.
%p
Page can't be loaded because of an encoding error.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment