diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-06 19:07:21 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-06 19:07:21 -0300 |
| commit | 8b88df94ebda2e829782f514ff51caeaf5e694dd (patch) | |
| tree | b1e0baa3ff26fd9285f6c1a751b5f97aa466b9b9 /actionpack | |
| parent | c539cc006179c98d418c6914ce567f657b6f1966 (diff) | |
| parent | d2876141d08341ec67cf6a11a073d1acfb920de7 (diff) | |
| download | rails-8b88df94ebda2e829782f514ff51caeaf5e694dd.tar.gz rails-8b88df94ebda2e829782f514ff51caeaf5e694dd.tar.bz2 rails-8b88df94ebda2e829782f514ff51caeaf5e694dd.zip | |
Merge pull request #19029 from iainbeeston/skipping-undefined-callbacks
Raise ArgumentError if an unrecognised callback is skipped
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/callbacks.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb index 59ffb0a19e..13795f0dd8 100644 --- a/actionpack/lib/abstract_controller/callbacks.rb +++ b/actionpack/lib/abstract_controller/callbacks.rb @@ -62,9 +62,9 @@ module AbstractController # using #skip_action_callback def skip_action_callback(*names) ActiveSupport::Deprecation.warn('`skip_action_callback` is deprecated and will be removed in the next major version of Rails. Please use skip_before_action, skip_after_action or skip_around_action instead.') - skip_before_action(*names) - skip_after_action(*names) - skip_around_action(*names) + skip_before_action(*names, raise: false) + skip_after_action(*names, raise: false) + skip_around_action(*names, raise: false) end def skip_filter(*names) |