Merge pull request #8472 from schneems/schneems/expand_path

Use `File.expand_path` instead of `File.join`

Merge pull request #8472 from schneems/schneems/expand_path
Use `File.expand_path` instead of `File.join`
05e61236 · Rafael Mendonça França · 81100356 · e073b038 · 05e61236
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

railties/lib/rails/info_controller.rb railties/lib/rails/info_controller.rb +1 -1

未找到文件。
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
 require 'action_dispatch/routing/inspector'

 class Rails::InfoController < ActionController::Base
-  self.view_paths = File.join(File.dirname(__FILE__), 'templates')
+  self.view_paths = File.expand_path('../templates', __FILE__)
  layout 'application'

  before_filter :require_local!