aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/template/resolver.rb
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2017-10-21 22:21:02 +0900
committerAkira Matsuda <ronnie@dio.jp>2017-10-21 22:48:28 +0900
commit8ae2fdd267d59d394be3e6724b357b11a8046784 (patch)
tree2e728322ca4fb9bf140a8635199bf0059f778fc9 /actionview/lib/action_view/template/resolver.rb
parentb0d0c9f40df3bee73d3f36005238d7d0227579d2 (diff)
downloadrails-8ae2fdd267d59d394be3e6724b357b11a8046784.tar.gz
rails-8ae2fdd267d59d394be3e6724b357b11a8046784.tar.bz2
rails-8ae2fdd267d59d394be3e6724b357b11a8046784.zip
[Action View] require_relative => require
This basically reverts c4d1a4efeec6f0b5b58222993aa0bec85a19b6a8
Diffstat (limited to 'actionview/lib/action_view/template/resolver.rb')
-rw-r--r--actionview/lib/action_view/template/resolver.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb
index a58d375293..5a86f10973 100644
--- a/actionview/lib/action_view/template/resolver.rb
+++ b/actionview/lib/action_view/template/resolver.rb
@@ -3,7 +3,7 @@
require "pathname"
require "active_support/core_ext/class"
require "active_support/core_ext/module/attribute_accessors"
-require_relative "../template"
+require "action_view/template"
require "thread"
require "concurrent/map"