Remove caching of Repository#has_visible_content?remove-has-visible-content-caching

This method already uses the cached method Repository#branch_count so
there's no point in also caching has_visible_content?.

Fixes gitlab-org/gitlab-ce#25278

1 files changed, 1 insertions, 13 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index e2e7d08abac..3c4b0212af7 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -85,11 +85,7 @@ class Repository
   # This method return true if repository contains some content visible in project page.
   #
   def has_visible_content?
-    return @has_visible_content unless @has_visible_content.nil?
-
-    @has_visible_content = cache.fetch(:has_visible_content?) do
-      branch_count > 0
-    end
+    branch_count > 0
   end
 
   def commit(ref = 'HEAD')
@@ -374,12 +370,6 @@ class Repository
     return unless empty?
 
     expire_method_caches(%i(empty?))
-    expire_has_visible_content_cache
-  end
-
-  def expire_has_visible_content_cache
-    cache.expire(:has_visible_content?)
-    @has_visible_content = nil
   end
 
   def lookup_cache
@@ -467,7 +457,6 @@ class Repository
   # Runs code after a new branch has been created.
   def after_create_branch
     expire_branches_cache
-    expire_has_visible_content_cache
 
     repository_event(:push_branch)
   end
@@ -481,7 +470,6 @@ class Repository
 
   # Runs code after an existing branch has been removed.
   def after_remove_branch
-    expire_has_visible_content_cache
     expire_branches_cache
   end