about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-01-21 22:20:01 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-01-21 22:20:01 +0100
commitb4a4eb73ae3a80c87a643967fb2aeffe1d1a11ea (patch)
tree5e1fedb110da9f47aa0da785b7899d7b064272e7 /app/controllers
parentf036c6440bb82ba627784b32dadc2a3309c7a1b4 (diff)
parented41f9f0b1d49e651c93cc9df90c21daca3f96a5 (diff)
Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0a6b50a29..e8cd48b6e 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" }
     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