aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAditya Kapoor <aditya.kapoor@vinsol.com>2015-01-05 12:56:23 +0530
committerAditya Kapoor <aditya.kapoor@vinsol.com>2015-01-05 16:52:19 +0530
commit21dfe89ac7175ec2a625843085a4cdd78952a187 (patch)
tree1e68f2f6ba341904b92a8ed1db3636f1ae2cc741 /actionpack/lib
parente50064c130f8b6465a78928e38588196515ccf27 (diff)
downloadrails-21dfe89ac7175ec2a625843085a4cdd78952a187.tar.gz
rails-21dfe89ac7175ec2a625843085a4cdd78952a187.tar.bz2
rails-21dfe89ac7175ec2a625843085a4cdd78952a187.zip
remove unneeded check since /_one_time_conditions/ is removed
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/abstract_controller/base.rb3
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