deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

5xx error status code for gitolite & encoding error

Browse source
This commit is contained in:
randx 2012-09-07 20:47:52 +03:00
parent e8f39a0a61
commit 367e17cc84
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -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|

8
app/views/errors/encoding.html.haml
View file

@ -1,5 +1,3 @@
.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.