diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-13 09:25:01 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-13 09:25:01 -0700 |
| commit | 59b773705e4d91c458a9572dc63c11eab85e633f (patch) | |
| tree | 18a35cf6371311059f4a1a81a4dbba2c8b09496b /railties/lib/rails/commands | |
| parent | aeac0bf620ab4504aceccf5cc3997c7a4ed96791 (diff) | |
| parent | d8c194968469f3afe39412818505ac94f78e386d (diff) | |
| download | rails-59b773705e4d91c458a9572dc63c11eab85e633f.tar.gz rails-59b773705e4d91c458a9572dc63c11eab85e633f.tar.bz2 rails-59b773705e4d91c458a9572dc63c11eab85e633f.zip | |
Merge pull request #6303 from korny/remove-require-rubygems
require "rubygems" is obsolete in Ruby 1.9.3
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/application.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/commands/plugin_new.rb | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb index 60d1aed73a..2cb6d5ca2e 100644 --- a/railties/lib/rails/commands/application.rb +++ b/railties/lib/rails/commands/application.rb @@ -19,7 +19,6 @@ else end end -require 'rubygems' if ARGV.include?("--dev") require 'rails/generators' require 'rails/generators/rails/app/app_generator' diff --git a/railties/lib/rails/commands/plugin_new.rb b/railties/lib/rails/commands/plugin_new.rb index 0287ba0638..4d7bf3c9f3 100644 --- a/railties/lib/rails/commands/plugin_new.rb +++ b/railties/lib/rails/commands/plugin_new.rb @@ -1,5 +1,3 @@ -require 'rubygems' if ARGV.include?("--dev") - if ARGV.first != "new" ARGV[0] = "--help" else |