Merge branch 'master' into clear_all_environments_log_by_default

1 files changed, 5 insertions, 7 deletions

diff --git a/actionview/lib/action_view/log_subscriber.rb b/actionview/lib/action_view/log_subscriber.rb
index c9f308c2a2..d03e1a51b8 100644
--- a/actionview/lib/action_view/log_subscriber.rb
+++ b/actionview/lib/action_view/log_subscriber.rb
@@ -51,20 +51,20 @@ module ActionView
       ActionView::Base.logger
     end
 
-  protected
+  private
 
     EMPTY = ""
-    def from_rails_root(string)
+    def from_rails_root(string) # :doc:
       string = string.sub(rails_root, EMPTY)
       string.sub!(VIEWS_PATTERN, EMPTY)
       string
     end
 
-    def rails_root
+    def rails_root # :doc:
       @root ||= "#{Rails.root}/"
     end
 
-    def render_count(payload)
+    def render_count(payload) # :doc:
       if payload[:cache_hits]
         "[#{payload[:cache_hits]} / #{payload[:count]} cache hits]"
       else
@@ -72,7 +72,7 @@ module ActionView
       end
     end
 
-    def cache_message(payload)
+    def cache_message(payload) # :doc:
       if payload[:cache_hit]
         "[cache hit]"
       else
@@ -80,8 +80,6 @@ module ActionView
       end
     end
 
-  private
-
     def log_rendering_start(payload)
       info do
         message = "  Rendering #{from_rails_root(payload[:identifier])}"