diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-02-03 17:31:35 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-02-03 17:31:35 -0800 |
| commit | dd13874ff60371b51bd436e70943db932b180b45 (patch) | |
| tree | a0bbbdab818d5b802f86811d50f0461f7b0b5d75 /railties | |
| parent | 79817aa9e7fa7c207868ca56ca8bbd0ee5303d81 (diff) | |
| parent | 9b033d14b240ae1ae8b1486af1d0afa8ae2a1ec6 (diff) | |
| download | rails-dd13874ff60371b51bd436e70943db932b180b45.tar.gz rails-dd13874ff60371b51bd436e70943db932b180b45.tar.bz2 rails-dd13874ff60371b51bd436e70943db932b180b45.zip | |
Merge
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/generators/rails/app/templates/config/boot.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb index 70bd40bc4c..7407d6143a 100644 --- a/railties/lib/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/generators/rails/app/templates/config/boot.rb @@ -1,6 +1,6 @@ # Use Bundler (preferred) begin - require File.expand_path('../../vendor/environment', __FILE__) + require File.expand_path('../../.bundle/environment', __FILE__) rescue LoadError require 'rubygems' require 'bundler' diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index f0dcf61d98..4240038673 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -59,6 +59,9 @@ when 'runner' require 'rails/commands/runner' require ENV_PATH + +when '--version', '-v' + puts "Rails #{Rails::VERSION::STRING}" when '--help', '-h' puts HELP_TEXT when '--version', '-v' |