aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-17 15:39:41 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-17 15:39:41 -0700
commit251a6e492c72d8aea713b7dabd245d68301e455d (patch)
tree4669f0d230ecf41c6a2fde4b9ba9edb7fc03dd92
parentd8f352e970ec86e8b791f9994465a3678a44281f (diff)
downloadrails-251a6e492c72d8aea713b7dabd245d68301e455d.tar.gz
rails-251a6e492c72d8aea713b7dabd245d68301e455d.tar.bz2
rails-251a6e492c72d8aea713b7dabd245d68301e455d.zip
Rename path.rb to resolver.rb
-rw-r--r--actionpack/lib/action_view.rb2
-rw-r--r--actionpack/lib/action_view/template/resolver.rb (renamed from actionpack/lib/action_view/template/path.rb)0
-rw-r--r--actionpack/lib/action_view/template/template.rb2
3 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index b4eddca378..3e3b68c71d 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -37,7 +37,7 @@ module ActionView
autoload :Helpers, 'action_view/helpers'
autoload :InlineTemplate, 'action_view/template/inline'
autoload :Partials, 'action_view/render/partials'
- autoload :Resolver, 'action_view/template/path'
+ autoload :Resolver, 'action_view/template/resolver'
autoload :PathSet, 'action_view/paths'
autoload :Rendering, 'action_view/render/rendering'
autoload :Renderable, 'action_view/template/renderable'
diff --git a/actionpack/lib/action_view/template/path.rb b/actionpack/lib/action_view/template/resolver.rb
index d15f53a11b..d15f53a11b 100644
--- a/actionpack/lib/action_view/template/path.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template/template.rb
index 53aaa3dded..fac50cd692 100644
--- a/actionpack/lib/action_view/template/template.rb
+++ b/actionpack/lib/action_view/template/template.rb
@@ -2,7 +2,7 @@
# This is so that templates compiled in this file are UTF-8
require 'set'
-require "action_view/template/path"
+require "action_view/template/resolver"
module ActionView
class Template