diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2019-04-11 05:48:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 05:48:50 -0400 |
| commit | 45511fa8b20c621e2cf193ddaeb7d6fbe8432fea (patch) | |
| tree | 43133d04cfbd748456fd4d6045fa23e4ed69d881 /actionmailbox/app | |
| parent | 5963b3d9aceff52b7785823c26e8dcf866da5298 (diff) | |
| parent | 1b2f1735e77a89d8bdb929d63a2849b1381074b8 (diff) | |
| download | rails-45511fa8b20c621e2cf193ddaeb7d6fbe8432fea.tar.gz rails-45511fa8b20c621e2cf193ddaeb7d6fbe8432fea.tar.bz2 rails-45511fa8b20c621e2cf193ddaeb7d6fbe8432fea.zip | |
Merge pull request #35935 from y-yagi/fixes_34837
Fix loading `ActionMailbox::BaseController` when CSRF protection is disabled
Diffstat (limited to 'actionmailbox/app')
| -rw-r--r-- | actionmailbox/app/controllers/action_mailbox/base_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailbox/app/controllers/action_mailbox/base_controller.rb b/actionmailbox/app/controllers/action_mailbox/base_controller.rb index f0f1f555e6..92477b86a8 100644 --- 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 |