diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-04-02 10:10:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-02 10:10:28 +0200 |
commit | 4525701c90b56aa3c70e08092f06a48187a2ea1d (patch) | |
tree | a3b659e0d833cce45b2d5d6f42306ed6c27ea5db /actionview/lib/action_view/template | |
parent | ef5ebd93d68c8287e42754e6bafc6c2ec0afa900 (diff) | |
parent | 90196398a14896e6a279cbbaa6651861360abc0f (diff) | |
download | rails-4525701c90b56aa3c70e08092f06a48187a2ea1d.tar.gz rails-4525701c90b56aa3c70e08092f06a48187a2ea1d.tar.bz2 rails-4525701c90b56aa3c70e08092f06a48187a2ea1d.zip |
Merge pull request #35826 from cpruitt/rename-file-to-rawfile
Rename `Template::File` to `Template::RawFile`
Diffstat (limited to 'actionview/lib/action_view/template')
-rw-r--r-- | actionview/lib/action_view/template/error.rb | 2 | ||||
-rw-r--r-- | actionview/lib/action_view/template/raw_file.rb (renamed from actionview/lib/action_view/template/file.rb) | 2 |
2 files changed, 2 insertions, 2 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..61818ba52f 100644 --- a/actionview/lib/action_view/template/file.rb +++ b/actionview/lib/action_view/template/raw_file.rb @@ -3,7 +3,7 @@ module ActionView #:nodoc: # = Action View File Template class Template #:nodoc: - class File #:nodoc: + class RawFile #:nodoc: attr_accessor :type, :format def initialize(filename) |