Cant use inclusion in commands/application.rb as the frameworks haven…

…t all been required yet
rails · Apr 11, 2011 · 1d8bf4f · 1d8bf4f
1 parent 1f3d3eb
commit 1d8bf4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb
@@ -2,6 +2,7 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/inclusion'
 
 require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/object/instance_variables'

diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
@@ -1,7 +1,6 @@
 require 'rails/version'
-require 'active_support/core_ext/object/inclusion'
 
-if ARGV.first.either?('--version', '-v')
+if ['--version', '-v'].include?(ARGV.first)
   puts "Rails #{Rails::VERSION::STRING}"
   exit(0)
 end