diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-04 13:05:27 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-04 13:05:27 +0100 |
| commit | ab14e3f8628da81535c09eab3ba48d06725c6769 (patch) | |
| tree | 1409b4049bbc3075f7618a4759797dc6de2116d9 /railties/lib/generators/rails/app/templates | |
| parent | 31248fe3698c8d6c54465dfdf463ea49749e1c33 (diff) | |
| parent | c9ec28b2b643de7a315276cc285d7a4506b9d568 (diff) | |
| download | rails-ab14e3f8628da81535c09eab3ba48d06725c6769.tar.gz rails-ab14e3f8628da81535c09eab3ba48d06725c6769.tar.bz2 rails-ab14e3f8628da81535c09eab3ba48d06725c6769.zip | |
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'railties/lib/generators/rails/app/templates')
| -rw-r--r-- | railties/lib/generators/rails/app/templates/Gemfile | 2 | ||||
| -rw-r--r-- | railties/lib/generators/rails/app/templates/config/boot.rb | 7 |
2 files changed, 6 insertions, 3 deletions
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 %>" diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb index 70bd40bc4c..03396113e8 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' @@ -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 -%> |