ProjectPresenter fixes44725-fix_project_presenter_data

3 files changed, 6 insertions, 3 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index c2f62badbcb..923a5794d09 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -339,6 +339,7 @@ class Repository
       cache.expire(:"diverging_commit_counts_#{branch_name}")
       cache.expire(:"commit_count_#{branch_name}")
     end
+    cache.expire(:'license_blob')
   end
 
   def expire_root_ref_cache
diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index ad655a7b3f4..79a1bca0ebb 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -29,6 +29,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
     [
       changelog_anchor_data,
       license_anchor_data,
+      readme_anchor_data,
       contribution_guide_anchor_data,
       autodevops_anchor_data(show_auto_devops_callout: show_auto_devops_callout),
       kubernetes_cluster_anchor_data,
diff --git a/app/workers/project_cache_worker.rb b/app/workers/project_cache_worker.rb
index a993b4b2680..b594d0427e7 100644
--- a/app/workers/project_cache_worker.rb
+++ b/app/workers/project_cache_worker.rb
@@ -33,8 +33,9 @@ class ProjectCacheWorker
   private
 
   def try_obtain_lease_for(project_id, section)
-    Gitlab::ExclusiveLease
-      .new("project_cache_worker:#{project_id}:#{section}", timeout: LEASE_TIMEOUT)
-      .try_obtain
+    lease_key = "project_cache_worker:#{project_id}:#{section}"
+    lease_uuid = Gitlab::ExclusiveLease.new(lease_key, timeout: LEASE_TIMEOUT).try_obtain
+  ensure
+    Gitlab::ExclusiveLease.cancel(lease_key, lease_uuid) if defined?(lease_key) && defined?(lease_uuid)
   end
 end