Ruby 1.9: qualify toplevel File reference since config.ru could be eval'd in a different scope

Restores accidentally-reverted commit.

Ruby 1.9: qualify toplevel File reference since config.ru could be eval'd in a different scope
Restores accidentally-reverted commit.
2ca93403 · Joshua Peek · Jeremy Kemper · 2110a524 · 2ca93403
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

railties/lib/rails/generators/rails/app/templates/config.ru railties/lib/rails/generators/rails/app/templates/config.ru +1 -1

未找到文件。
--- a/railties/lib/rails/generators/rails/app/templates/config.ru
+++ b/railties/lib/rails/generators/rails/app/templates/config.ru
 # 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