diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-03-30 13:33:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-30 13:33:52 -0700 |
| commit | 2bf55179813190f2a79509383e21c2b43e72f4c2 (patch) | |
| tree | 220eca9ebaa2e54df78eb1d4430ab8fbc39dcddc /actionview/lib/action_view/template/error.rb | |
| parent | 197fe2222e553354823fd7685e9d174281e33c3c (diff) | |
| parent | c7820d8124c854760a4d288334f185de2fb99446 (diff) | |
| download | rails-2bf55179813190f2a79509383e21c2b43e72f4c2.tar.gz rails-2bf55179813190f2a79509383e21c2b43e72f4c2.tar.bz2 rails-2bf55179813190f2a79509383e21c2b43e72f4c2.zip | |
Merge pull request #35688 from jhawthorn/render_file_rfc
RFC: Introduce Template::File
Diffstat (limited to 'actionview/lib/action_view/template/error.rb')
| -rw-r--r-- | actionview/lib/action_view/template/error.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/template/error.rb b/actionview/lib/action_view/template/error.rb index d0ea03e228..aace0be04d 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 |