diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-31 12:05:50 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-31 12:05:50 -0800 |
| commit | 3fbff7811bc7142e6f4142f807dd7b6ebd766a13 (patch) | |
| tree | 3545eb8fc6bfa2a90712eaa03efe8d8986438271 /actionview | |
| parent | e8fcd599ba6a301dbddb084f7369320ca3c49ff3 (diff) | |
| download | rails-3fbff7811bc7142e6f4142f807dd7b6ebd766a13.tar.gz rails-3fbff7811bc7142e6f4142f807dd7b6ebd766a13.tar.bz2 rails-3fbff7811bc7142e6f4142f807dd7b6ebd766a13.zip | |
just require the template resolver
LookupContext is eagerly loaded, and FallbackFileSystemResolver is
referenced at the class level. Just require the resolver from the
eagerly loaded class rather than jumping through autoload hoops
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view.rb | 1 | ||||
| -rw-r--r-- | actionview/lib/action_view/lookup_context.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view.rb b/actionview/lib/action_view.rb index 0eb29b7ebb..50712e0830 100644 --- a/actionview/lib/action_view.rb +++ b/actionview/lib/action_view.rb @@ -56,7 +56,6 @@ module ActionView autoload_at "action_view/template/resolver" do autoload :Resolver autoload :PathResolver - autoload :FileSystemResolver autoload :OptimizedFileSystemResolver autoload :FallbackFileSystemResolver end diff --git a/actionview/lib/action_view/lookup_context.rb b/actionview/lib/action_view/lookup_context.rb index e07d9b6314..76c9890776 100644 --- a/actionview/lib/action_view/lookup_context.rb +++ b/actionview/lib/action_view/lookup_context.rb @@ -1,6 +1,7 @@ require 'thread_safe' require 'active_support/core_ext/module/remove_method' require 'active_support/core_ext/module/attribute_accessors' +require 'action_view/template/resolver' module ActionView # = Action View Lookup Context |