diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-21 22:31:19 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-21 22:31:19 +0100 |
commit | 500278eb4c73506cd965c3abc06a2449c8071e1e (patch) | |
tree | 90207264b8f460a3ede23b0b50fbe655c5a0f1c9 /app/controllers | |
parent | f036c6440bb82ba627784b32dadc2a3309c7a1b4 (diff) | |
parent | e22a56183a26283941a3260341ef84ce03e8ba44 (diff) |
Merge branch 'ineffyble-fix/error-pages'
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/application_controller.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0a6b50a29..e4b6d0faf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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', layout: 'error' } end end def gone respond_to do |format| format.any { head 410 } + format.html { render 'errors/410', layout: 'error' } + end + end + + def unprocessable_entity + respond_to do |format| + format.any { head 422 } + format.html { render 'errors/422', layout: 'error' } end end |