diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-10-16 18:10:12 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-10-16 18:10:52 -0700 |
| commit | e1fdc8bba3e427435927685e77937b3a478aa416 (patch) | |
| tree | 75cb24d055729f56d06dbabd1afda56c757e9bf0 /railties/lib/rails/generators/rails/app/templates/config/application.rb | |
| parent | 29ba9c030704fb76dc2debbfecbb10fd70233d18 (diff) | |
| download | rails-e1fdc8bba3e427435927685e77937b3a478aa416.tar.gz rails-e1fdc8bba3e427435927685e77937b3a478aa416.tar.bz2 rails-e1fdc8bba3e427435927685e77937b3a478aa416.zip | |
Remove config.gem in favor of using the bundler. This makes config/boot.rb obsolete.
The bundler library is at: http://github.com/wycats/bundler/ and is a rubygem.
Diffstat (limited to 'railties/lib/rails/generators/rails/app/templates/config/application.rb')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index cf786093ba..451dba86fb 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -1,5 +1,12 @@ -# Bootstrap the Rails environment, frameworks, and default configuration -require File.expand_path(File.join(File.dirname(__FILE__), 'boot')) +begin + # Use Bundler + require File.expand_path("../../vendor/gems/environment", __FILE__) +rescue LoadError + # Use Rubygems + require 'rubygems' +end + +require 'rails' Rails::Initializer.run do |config| # Settings in config/environments/* take precedence over those specified here. |