aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-10-19 18:12:29 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-10-19 18:12:29 -0700
commit4afe70790cd26e6b8f17106d031c67ce4da3efbe (patch)
tree836c558e997a53f649d32337ca6f22f420b8595b
parent3072bf75557346f1e70c47baef0fba205bc39c51 (diff)
downloadrails-4afe70790cd26e6b8f17106d031c67ce4da3efbe.tar.gz
rails-4afe70790cd26e6b8f17106d031c67ce4da3efbe.tar.bz2
rails-4afe70790cd26e6b8f17106d031c67ce4da3efbe.zip
Check for environment.rb
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/boot.rb2
1 files changed, 1 insertions, 1 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 2c527b4a4a..5aa49ca5e6 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -1,6 +1,6 @@
# Use Bundler (preferred)
environment = File.expand_path('../../vendor/gems/environment', __FILE__)
-if File.exist?(environment)
+if File.exist?("#{environment}.rb")
require environment
# Use 2.x style vendor/rails and RubyGems