From f497e7ad1d52fb795784cf6f5b2bc456e46dbd27 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Wed, 3 Feb 2010 16:56:32 -0800 Subject: Update rails to use the latest bundler --- railties/lib/generators/rails/app/templates/config/boot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties') 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' -- cgit v1.2.3 From 1ae543a180095efef5ad59eb9883748ca20cebcf Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Thu, 4 Feb 2010 11:08:46 +1100 Subject: -v and --version params now work on rails script in or our of an app --- railties/lib/rails/commands.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'railties') 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' -- cgit v1.2.3