Merge branch 'master' of https://github.com/rails/rails into performance_test

1 files changed, 3 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 35be0b3a27..a65f6e1fce 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1,6 +1,7 @@
 require 'erb'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/inclusion'
 require 'active_support/inflector'
 require 'action_dispatch/routing/redirection'
 
@@ -1345,11 +1346,11 @@ module ActionDispatch
           end
 
           def resource_scope? #:nodoc:
-            [:resource, :resources].include?(@scope[:scope_level])
+            @scope[:scope_level].in?([:resource, :resources])
           end
 
           def resource_method_scope? #:nodoc:
-            [:collection, :member, :new].include?(@scope[:scope_level])
+            @scope[:scope_level].in?([:collection, :member, :new])
           end
 
           def with_exclusive_scope