diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-11-07 11:11:26 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-11-07 11:11:26 -0800 |
| commit | 1c4722560918b2d3cf30466b7daed2283b3d3482 (patch) | |
| tree | e944a901236657045b2161a7cd6d970dbb958303 | |
| parent | 30526ac1197a190956273d862c02839de27c09d2 (diff) | |
| parent | daf226abc86557f1f48933a2fd56ee594478f528 (diff) | |
| download | rails-1c4722560918b2d3cf30466b7daed2283b3d3482.tar.gz rails-1c4722560918b2d3cf30466b7daed2283b3d3482.tar.bz2 rails-1c4722560918b2d3cf30466b7daed2283b3d3482.zip | |
Merge pull request #12799 from arunagw/aa-av-test-fixes
Don't call sub! since it may return nil. Reverts 4d15661.
| -rw-r--r-- | actionview/lib/action_view/log_subscriber.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/log_subscriber.rb b/actionview/lib/action_view/log_subscriber.rb index 3095c9a91e..9336b29d0b 100644 --- a/actionview/lib/action_view/log_subscriber.rb +++ b/actionview/lib/action_view/log_subscriber.rb @@ -30,7 +30,7 @@ module ActionView EMPTY = '' def from_rails_root(string) - string.sub(rails_root, EMPTY).sub!(VIEWS_PATTERN, EMPTY) + string.sub(rails_root, EMPTY).sub(VIEWS_PATTERN, EMPTY) end def rails_root |