diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-05 09:47:30 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-05 09:47:30 -0300 |
| commit | f8e36d49f4285db413af8bee7d048d313ec05de5 (patch) | |
| tree | 17be55f5752886f7382dc3a83d24f7c0de8519cd /actionpack | |
| parent | d824e02c20c683da01b77187946cc28de121d757 (diff) | |
| parent | 21dfe89ac7175ec2a625843085a4cdd78952a187 (diff) | |
| download | rails-f8e36d49f4285db413af8bee7d048d313ec05de5.tar.gz rails-f8e36d49f4285db413af8bee7d048d313ec05de5.tar.bz2 rails-f8e36d49f4285db413af8bee7d048d313ec05de5.zip | |
Merge pull request #18341 from aditya-kapoor/remove-unneeded-checks
remove unneeded check since /_one_time_conditions/ is not present anymore.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index 5bb34daf81..8c7cec3561 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -86,8 +86,7 @@ module AbstractController # And always exclude explicitly hidden actions hidden_actions.to_a - # Clear out AS callback method pollution - Set.new(methods.reject { |method| method =~ /_one_time_conditions/ }) + methods.to_set end end |