From e073b038b7eb27f3dd18aa1edbd5a0b7e76b6476 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Sun, 9 Dec 2012 17:51:58 -0800
Subject: Use `File.expand_path` instead of `File.join`
cc/ @carlosantoniodasilva
---
railties/lib/rails/info_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb
index e94c6a2030..fe1e25d88c 100644
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
@@ -1,7 +1,7 @@
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!
--
cgit v1.2.3