diff options
author | Oscar Del Ben <info@oscardelben.com> | 2012-05-14 13:56:26 -0700 |
---|---|---|
committer | Oscar Del Ben <info@oscardelben.com> | 2012-05-14 13:56:26 -0700 |
commit | f2af398efa40dff20d4841d595bc0366660707cc (patch) | |
tree | 8af0c081de5f2d6cfc1b033c5eefa9954de569dd /actionpack/lib/action_view/template | |
parent | 59462c1e310b85569785cf5f491611e670c2755b (diff) | |
parent | 151aa9abae131f1a03513f756aeaef2fc403f9bb (diff) | |
download | rails-f2af398efa40dff20d4841d595bc0366660707cc.tar.gz rails-f2af398efa40dff20d4841d595bc0366660707cc.tar.bz2 rails-f2af398efa40dff20d4841d595bc0366660707cc.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_view/template')
-rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb index 8ea2e5bfe4..08155af013 100644 --- a/actionpack/lib/action_view/template/resolver.rb +++ b/actionpack/lib/action_view/template/resolver.rb @@ -1,5 +1,6 @@ require "pathname" require "active_support/core_ext/class" +require "active_support/core_ext/class/attribute_accessors" require "action_view/template" module ActionView |