aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-26 11:52:37 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-26 11:52:37 -0500
commit15cffe6fbc1b0429b06c524fbcedbd50972f53b6 (patch)
tree246bd44f8c4cca2ddad0529779ee5b10f6f7e7bb
parentef58194129a1dc0a96286c271b71455d37712b42 (diff)
downloadrails-15cffe6fbc1b0429b06c524fbcedbd50972f53b6.tar.gz
rails-15cffe6fbc1b0429b06c524fbcedbd50972f53b6.tar.bz2
rails-15cffe6fbc1b0429b06c524fbcedbd50972f53b6.zip
ruby 1.9: Qualify toplevel File reference since config.ru could be eval'd in a different scope
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config.ru2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru
index acbfe4e9ae..541e200193 100644
--- a/railties/lib/rails/generators/rails/app/templates/config.ru
+++ b/railties/lib/rails/generators/rails/app/templates/config.ru
@@ -1,7 +1,7 @@
# Rack Dispatcher
# Require your environment file to bootstrap Rails
-require File.dirname(__FILE__) + '/config/environment'
+require ::File.dirname(__FILE__) + '/config/environment'
# Dispatch the request
run ActionController::Dispatcher.new