aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract/callbacks_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-03 19:53:28 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-03 19:53:28 -0300
commit489a8f2a44dc9cea09154ee1ee2557d1f037c7d4 (patch)
treec040281246553da3c7a5a6a4eb091a2c4b42181c /actionpack/test/abstract/callbacks_test.rb
parent1c6bb0efe0933cf0880c13ac0c379b65781a2353 (diff)
downloadrails-489a8f2a44dc9cea09154ee1ee2557d1f037c7d4.tar.gz
rails-489a8f2a44dc9cea09154ee1ee2557d1f037c7d4.tar.bz2
rails-489a8f2a44dc9cea09154ee1ee2557d1f037c7d4.zip
Partially revert deprecation of *_filter
We are going to deprecate only on Rails 5 to make easier plugin maintainers support different Rails versions. Right now we are only discouraging their usage. This reverts commit 6c5f43bab8206747a8591435b2aa0ff7051ad3de. Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/test/abstract/callbacks_test.rb')
-rw-r--r--actionpack/test/abstract/callbacks_test.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/test/abstract/callbacks_test.rb b/actionpack/test/abstract/callbacks_test.rb
index 07571602e4..8cba049485 100644
--- a/actionpack/test/abstract/callbacks_test.rb
+++ b/actionpack/test/abstract/callbacks_test.rb
@@ -267,11 +267,9 @@ module AbstractController
end
class AliasedCallbacks < ControllerWithCallbacks
- ActiveSupport::Deprecation.silence do
- before_filter :first
- after_filter :second
- around_filter :aroundz
- end
+ before_filter :first
+ after_filter :second
+ around_filter :aroundz
def first
@text = "Hello world"