diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-11 15:25:39 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-11 15:25:39 +0200 |
| commit | 1d8bf4f4f900a905e6350e246a683659b5480ec9 (patch) | |
| tree | 9170245bfb4d99d19cddb7a1e3ecbce0b3d7c8b6 | |
| parent | 1f3d3eb49d16b62250c24e3374cc36de99b397b8 (diff) | |
| download | rails-1d8bf4f4f900a905e6350e246a683659b5480ec9.tar.gz rails-1d8bf4f4f900a905e6350e246a683659b5480ec9.tar.bz2 rails-1d8bf4f4f900a905e6350e246a683659b5480ec9.zip | |
Cant use inclusion in commands/application.rb as the frameworks havent all been required yet
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/commands/application.rb | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb index 790a26f5c1..9ad1e12699 100644 --- 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/acts_like' 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 index 20eb8b485e..f3fa1fd54d 100644 --- 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 |