diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-08 15:38:51 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-08 15:38:51 -0300 |
| commit | 670281c6b2e9b9e8c51a140f2a5f66b251f1b84b (patch) | |
| tree | ab141872d72e010c8a0fe371d22a00914c97e1eb /actionpack/lib/action_view.rb | |
| parent | 39e4e76d15233bb1cb0b778d920f54efe86bb4f0 (diff) | |
| parent | 1a0f822037c408a392ffa7b6e1ecbe5951ab48db (diff) | |
| download | rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.tar.gz rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.tar.bz2 rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'actionpack/lib/action_view.rb')
| -rw-r--r-- | actionpack/lib/action_view.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index 70176a0ea4..d90afb1913 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -40,6 +40,7 @@ module ActionView autoload :MissingTemplate, 'action_view/base' autoload :Partials, 'action_view/render/partials' autoload :Resolver, 'action_view/template/resolver' + autoload :PathResolver, 'action_view/template/resolver' autoload :PathSet, 'action_view/paths' autoload :Rendering, 'action_view/render/rendering' autoload :Renderable, 'action_view/template/renderable' |