Merge pull request #12799 from arunagw/aa-av-test-fixes

Don't call sub! since it may return nil. Reverts 4d15661d.

actionview/lib/action_view/log_subscriber.rb

@@ -30,7 +30,7 @@ def logger
 
     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