diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-04 12:35:46 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-04 12:35:46 -0300 |
| commit | 871af9122b947043d38887e293cd1124468e4eeb (patch) | |
| tree | 1b3b0771c6544f71b86c5b2b7c089cff74b5cf52 /railties/lib | |
| parent | 295f2bd1320b5dac6aa34e12baa670eb00e979cc (diff) | |
| parent | 8572fcd9f8a9226bef794f972dfb63e4bcee9cb2 (diff) | |
| download | rails-871af9122b947043d38887e293cd1124468e4eeb.tar.gz rails-871af9122b947043d38887e293cd1124468e4eeb.tar.bz2 rails-871af9122b947043d38887e293cd1124468e4eeb.zip | |
Merge pull request #16046 from grosser/grosser/cleangen
Do not load rails without loading bundler
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/boot.rb | 3 |
1 files changed, 1 insertions, 2 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 5e5f0c1fac..6b750f00b1 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -1,4 +1,3 @@ -# Set up gems listed in the Gemfile. ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) +require 'bundler/setup' # Set up gems listed in the Gemfile. |