tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages

Browse Source
This commit is contained in:
Eugen Rochko
2017-01-21 22:20:01 +01:00
parent f036c6440b ed41f9f0b1
commit b4a4eb73ae
5 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/application_controller.rb
View File

@@ -11,6 +11,7 @@ class ApplicationController < ActionController::Base
rescue_from ActionController::RoutingError, with: :not_found
rescue_from ActiveRecord::RecordNotFound, with: :not_found
rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity
before_action :store_current_location, except: :raise_not_found, unless: :devise_controller?
before_action :set_locale
@@ -50,12 +51,21 @@ class ApplicationController < ActionController::Base
def not_found
respond_to do |format|
format.any { head 404 }
format.html { render "errors/404" }
end
end
def gone
respond_to do |format|
format.any { head 410 }
format.html { render "errors/410" }
end
end
def unprocessable_entity
respond_to do |format|
format.any { head 422 }
format.html { render "errors/422" }
end
end