aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-05-24 01:06:43 -0700
committerJosé Valim <jose.valim@gmail.com>2012-05-24 01:06:43 -0700
commitabccf82c8b1010736c72058948d42acb7127f82a (patch)
tree381a51aefece6665ea3d8cef1482cc59dead4eb5
parent95c49f2445aca2f974b6886193627379a7c4f7bf (diff)
parent66db0b9440e4db594c951d38f641e1910fd44db3 (diff)
downloadrails-abccf82c8b1010736c72058948d42acb7127f82a.tar.gz
rails-abccf82c8b1010736c72058948d42acb7127f82a.tar.bz2
rails-abccf82c8b1010736c72058948d42acb7127f82a.zip
Merge pull request #6471 from parndt/rails_root_should_be_join_able
Fixes possible backward incompatibility
-rw-r--r--railties/lib/rails/engine.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 619c76206d..4c7199a2e2 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -652,7 +652,7 @@ module Rails
root = File.exist?("#{root_path}/#{flag}") ? root_path : default
raise "Could not find root path for #{self}" unless root
- File.realpath root
+ Pathname.new File.realpath root
end
def default_middleware_stack