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

Rescue encoding error on controller level

Browse source
This commit is contained in:
randx 2012-05-31 23:36:52 +03:00
parent a719bfc931
commit 17d4cac208
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -9,6 +9,10 @@ class ApplicationController < ActionController::Base
render "errors/gitolite", :layout => "error" render "errors/gitolite", :layout => "error"
end end
rescue_from Encoding::CompatibilityError do |exception|
render "errors/encoding", :layout => "error", :status => 404
end
rescue_from ActiveRecord::RecordNotFound do |exception| rescue_from ActiveRecord::RecordNotFound do |exception|
render "errors/not_found", :layout => "error", :status => 404 render "errors/not_found", :layout => "error", :status => 404
end end

6
app/views/errors/encoding.html.haml Normal file
View file

@ -0,0 +1,6 @@
.alert-message.block-message.error
%h3 Encoding Error
%hr
%p
Page cant be loaded cause of encoding error