aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2017-01-19 17:20:58 +0000
committerGitHub <noreply@github.com>2017-01-19 17:20:58 +0000
commitc64ee8ed5339245ab7e8638f464b070fba910917 (patch)
treeebef37ea113ea42aa94a19b861a5ee243f163241
parent04bf257195b2966e4b998fa4278efb3629673d46 (diff)
parentc406cf2e3dcbf2e8f74fe7aaf668e3e6f322c7ed (diff)
downloadrails-c64ee8ed5339245ab7e8638f464b070fba910917.tar.gz
rails-c64ee8ed5339245ab7e8638f464b070fba910917.tar.bz2
rails-c64ee8ed5339245ab7e8638f464b070fba910917.zip
Merge pull request #27733 from kenta-s/add-missing-argument-to-find_templates
`find_templates` should be able to handle 5 arguments
-rw-r--r--actionview/lib/action_view/template/resolver.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb
index 9da13663d7..924de3da06 100644
--- a/actionview/lib/action_view/template/resolver.rb
+++ b/actionview/lib/action_view/template/resolver.rb
@@ -164,8 +164,8 @@ module ActionView
# This is what child classes implement. No defaults are needed
# because Resolver guarantees that the arguments are present and
# normalized.
- def find_templates(name, prefix, partial, details)
- raise NotImplementedError, "Subclasses must implement a find_templates(name, prefix, partial, details) method"
+ def find_templates(name, prefix, partial, details, outside_app_allowed = false)
+ raise NotImplementedError, "Subclasses must implement a find_templates(name, prefix, partial, details, outside_app_allowed = false) method"
end
# Helpers that builds a path. Useful for building virtual paths.