From be140e8c6be966349c6fa35a87f84d5a73995b9a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 30 Nov 2008 15:59:30 -0600
Subject: Changed Rails.root to return a Pathname object (allows for
 Rails.root.join("app", "controllers") => "#{RAILS_ROOT}/app/controllers")
 [#1482]

---
 railties/lib/initializer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index ef0c335478..a134c68a50 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -48,8 +48,8 @@ module Rails
       end
     end
 
-    def root(*args)
-      File.join(RAILS_ROOT, *args.compact) if defined?(RAILS_ROOT)
+    def root
+      Pathname.new(RAILS_ROOT) if defined?(RAILS_ROOT)
     end
 
     def env
-- 
cgit v1.2.3