aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-26 11:52:37 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2009-10-16 14:21:27 -0700
commit2ca93403a259a8e6cead1c3a6eba675df9f1586a (patch)
tree715d186302f72aa1053e3c3d0d2c4bca4416e2ff /railties/lib
parent2110a524a4913815d036786aa01319fd67db0ee2 (diff)
downloadrails-2ca93403a259a8e6cead1c3a6eba675df9f1586a.tar.gz
rails-2ca93403a259a8e6cead1c3a6eba675df9f1586a.tar.bz2
rails-2ca93403a259a8e6cead1c3a6eba675df9f1586a.zip
Ruby 1.9: qualify toplevel File reference since config.ru could be eval'd in a different scope
Restores accidentally-reverted commit.
Diffstat (limited to 'railties/lib')
-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 3702ad0466..e6e73ece4c 100644
--- a/railties/lib/rails/generators/rails/app/templates/config.ru
+++ b/railties/lib/rails/generators/rails/app/templates/config.ru
@@ -1,5 +1,5 @@
# Require your environment file to bootstrap Rails
-require File.expand_path('../config/application', __FILE__)
+require ::File.expand_path('../config/application', __FILE__)
# Dispatch the request
run Rails.application.new