From 21dfe89ac7175ec2a625843085a4cdd78952a187 Mon Sep 17 00:00:00 2001
From: Aditya Kapoor <aditya.kapoor@vinsol.com>
Date: Mon, 5 Jan 2015 12:56:23 +0530
Subject: remove unneeded check since /_one_time_conditions/ is removed

---
 actionpack/lib/abstract_controller/base.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack')

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
 
-- 
cgit v1.2.3