diff options
| author | Andre Arko <andre@arko.net> | 2010-04-12 15:09:40 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-12 15:44:08 -0700 |
| commit | ca378659bcaa41f5bd231b6792bf50c941e7fd12 (patch) | |
| tree | 844284965659fd09a1754c8aaef63e677de61d84 /railties/lib | |
| parent | 86defed5ad6c1ec95b2f07a93982a514e2347749 (diff) | |
| download | rails-ca378659bcaa41f5bd231b6792bf50c941e7fd12.tar.gz rails-ca378659bcaa41f5bd231b6792bf50c941e7fd12.tar.bz2 rails-ca378659bcaa41f5bd231b6792bf50c941e7fd12.zip | |
Update the Bundler snippet for 0.9.15 and above
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/boot.rb | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index 3971a07012..712b0981e1 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -1,14 +1,6 @@ -# Use locked gems if present. -begin - require File.expand_path('../../.bundle/environment', __FILE__) - -rescue LoadError - # Otherwise, use RubyGems. - require 'rubygems' - - # And set up the gems listed in the Gemfile. - if File.exist?(File.expand_path('../../Gemfile', __FILE__)) - require 'bundler' - Bundler.setup - end +require 'rubygems' +# Set up gems listed in the Gemfile. +if File.exist?(File.expand_path('../../Gemfile', __FILE__)) + require 'bundler' + Bundler.setup end |