diff options
| author | Neeraj Singh <neerajdotname@gmail.com> | 2010-07-08 10:09:39 -0400 |
|---|---|---|
| committer | Neeraj Singh <neerajdotname@gmail.com> | 2010-07-08 10:09:39 -0400 |
| commit | 4a1207d54077348b67fad95ffde5710cf0be31bd (patch) | |
| tree | de721528fa81f1dfe50449c2d5c3985f513e83cd /railties/lib/rails/commands | |
| parent | f6fa6cf6117e691899c821b8999bd7dfb3f48b38 (diff) | |
| parent | dc364fdc595405aa3d5735e60d46ad3f9544a65b (diff) | |
| download | rails-4a1207d54077348b67fad95ffde5710cf0be31bd.tar.gz rails-4a1207d54077348b67fad95ffde5710cf0be31bd.tar.bz2 rails-4a1207d54077348b67fad95ffde5710cf0be31bd.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/application.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/runner.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb index a3a5aed399..47c6752ca3 100644 --- a/railties/lib/rails/commands/application.rb +++ b/railties/lib/rails/commands/application.rb @@ -4,7 +4,7 @@ if %w(--version -v).include? ARGV.first exit(0) end -if ARGV.first != "new" || ARGV.empty? +if ARGV.first != "new" ARGV[0] = "--help" else ARGV.shift diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb index b97ff086b6..c43a233bc3 100644 --- a/railties/lib/rails/commands/runner.rb +++ b/railties/lib/rails/commands/runner.rb @@ -37,7 +37,7 @@ ARGV.delete(code_or_file) ENV["RAILS_ENV"] = options[:environment] require APP_PATH -Rails::Application.require_environment! +Rails.application.require_environment! begin if code_or_file.nil? |