diff options
| author | wycats <wycats@gmail.com> | 2010-04-30 11:17:58 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-30 11:17:58 -0700 |
| commit | 0fe8827bf384cb99ab757236555c7af18793d515 (patch) | |
| tree | a7ac2143c78964cad8ee87d9ff8a1c52abf61249 /railties/lib/rails/commands | |
| parent | 91963e9e33eb5a28297323f1346aeb8b643e9d65 (diff) | |
| parent | 6b559474fb7fae0160860fc62752da347af032b2 (diff) | |
| download | rails-0fe8827bf384cb99ab757236555c7af18793d515.tar.gz rails-0fe8827bf384cb99ab757236555c7af18793d515.tar.bz2 rails-0fe8827bf384cb99ab757236555c7af18793d515.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/application.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/benchmarker.rb (renamed from railties/lib/rails/commands/performance/benchmarker.rb) | 0 | ||||
| -rw-r--r-- | railties/lib/rails/commands/profiler.rb (renamed from railties/lib/rails/commands/performance/profiler.rb) | 0 | ||||
| -rw-r--r-- | railties/lib/rails/commands/runner.rb | 3 |
4 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb index 438c976b35..8a8143e00e 100644 --- a/railties/lib/rails/commands/application.rb +++ b/railties/lib/rails/commands/application.rb @@ -10,4 +10,4 @@ require 'rubygems' if ARGV.include?("--dev") require 'rails/generators' require 'rails/generators/rails/app/app_generator' -Rails::Generators::AppGenerator.start
\ No newline at end of file +Rails::Generators::AppGenerator.start diff --git a/railties/lib/rails/commands/performance/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb index 0432261802..0432261802 100644 --- a/railties/lib/rails/commands/performance/benchmarker.rb +++ b/railties/lib/rails/commands/benchmarker.rb diff --git a/railties/lib/rails/commands/performance/profiler.rb b/railties/lib/rails/commands/profiler.rb index 6d9717b5cd..6d9717b5cd 100644 --- a/railties/lib/rails/commands/performance/profiler.rb +++ b/railties/lib/rails/commands/profiler.rb diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb index 1dd11e1241..278548558e 100644 --- a/railties/lib/rails/commands/runner.rb +++ b/railties/lib/rails/commands/runner.rb @@ -36,7 +36,8 @@ ARGV.delete(code_or_file) ENV["RAILS_ENV"] = options[:environment] -require ENV_PATH +require APP_PATH +Rails::Application.require_environment! begin if code_or_file.nil? |