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/lib/generators/rails/app/templates') 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 db15e49ddf64afd982ddb52e7d0487314f7dcf97 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 3 Feb 2010 22:08:48 -0800 Subject: Autorequire bundled libraries by default --- railties/lib/generators/rails/app/templates/config/boot.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'railties/lib/generators/rails/app/templates') diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb index 7407d6143a..03396113e8 100644 --- a/railties/lib/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/generators/rails/app/templates/config/boot.rb @@ -16,6 +16,9 @@ rescue LoadError # require 'rubygems' end +# Auto-require all bundled libraries. +Bundler.require + <% unless options[:skip_activerecord] -%> require 'rails/all' @@ -40,4 +43,4 @@ require "action_view/railtie" require "action_mailer/railtie" require "active_resource/railtie" require "rails/test_unit/railtie" -<% end -%> \ No newline at end of file +<% end -%> -- cgit v1.2.3 From c9ec28b2b643de7a315276cc285d7a4506b9d568 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 4 Feb 2010 00:21:47 -0800 Subject: Use a normal gem source url instead of a magic symbol --- railties/lib/generators/rails/app/templates/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/generators/rails/app/templates') diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index ce495177eb..2ad3041ab9 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/railties/lib/generators/rails/app/templates/Gemfile @@ -1,5 +1,5 @@ # Edit this Gemfile to bundle your application's dependencies. -source :gemcutter +source 'http://gemcutter.org' <% if !dev_or_edge? %> gem "rails", "<%= Rails::VERSION::STRING %>" -- cgit v1.2.3