aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/template
diff options
context:
space:
mode:
Diffstat (limited to 'actionview/lib/action_view/template')
-rw-r--r--actionview/lib/action_view/template/error.rb2
-rw-r--r--actionview/lib/action_view/template/raw_file.rb (renamed from actionview/lib/action_view/template/file.rb)4
2 files changed, 3 insertions, 3 deletions
diff --git a/actionview/lib/action_view/template/error.rb b/actionview/lib/action_view/template/error.rb
index aace0be04d..d0ea03e228 100644
--- a/actionview/lib/action_view/template/error.rb
+++ b/actionview/lib/action_view/template/error.rb
@@ -104,7 +104,7 @@ module ActionView
def line_number
@line_number ||=
if file_name
- regexp = /#{Regexp.escape ::File.basename(file_name)}:(\d+)/
+ regexp = /#{Regexp.escape File.basename(file_name)}:(\d+)/
$1 if message =~ regexp || backtrace.find { |line| line =~ regexp }
end
end
diff --git a/actionview/lib/action_view/template/file.rb b/actionview/lib/action_view/template/raw_file.rb
index 487e5735cf..623351305f 100644
--- a/actionview/lib/action_view/template/file.rb
+++ b/actionview/lib/action_view/template/raw_file.rb
@@ -1,9 +1,9 @@
# frozen_string_literal: true
module ActionView #:nodoc:
- # = Action View File Template
+ # = Action View RawFile Template
class Template #:nodoc:
- class File #:nodoc:
+ class RawFile #:nodoc:
attr_accessor :type, :format
def initialize(filename)