Merge pull request #35935 from y-yagi/fixes_34837

Fix loading `ActionMailbox::BaseController` when CSRF protection is disabled
rails · Apr 11, 2019 · 45511fa · 45511fa
2 parents 5963b3d + 1b2f173
commit 45511fa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/actionmailbox/app/controllers/action_mailbox/base_controller.rb b/actionmailbox/app/controllers/action_mailbox/base_controller.rb
@@ -3,7 +3,7 @@
 module ActionMailbox
   # The base class for all Action Mailbox ingress controllers.
   class BaseController < ActionController::Base
-    skip_forgery_protection
+    skip_forgery_protection if default_protect_from_forgery
 
     before_action :ensure_configured