Add latest changes from gitlab-org/gitlab@15-11-stable-ee

2 files changed, 16 insertions, 1 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 1e7ff6e8f0e..ebb57f6213f 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1488,6 +1488,7 @@ class MergeRequest < ApplicationRecord
 
   def fetch_ref!
     target_project.repository.fetch_source_branch!(source_project.repository, source_branch, ref_path)
+    expire_ancestor_cache
   end
 
   # Returns the current merge-ref HEAD commit.
@@ -2046,6 +2047,10 @@ class MergeRequest < ApplicationRecord
     self.draft = draft?
   end
 
+  def expire_ancestor_cache
+    project.repository.expire_ancestor_cache(target_branch_sha, diff_head_sha)
+  end
+
   def missing_report_error(report_type)
     { status: :error, status_reason: "This merge request does not have #{report_type} reports" }
   end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index b4a0eaf0324..62c402f1ae7 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -1008,7 +1008,7 @@ class Repository
   def ancestor?(ancestor_id, descendant_id)
     return false if ancestor_id.nil? || descendant_id.nil?
 
-    cache_key = "ancestor:#{ancestor_id}:#{descendant_id}"
+    cache_key = ancestor_cache_key(ancestor_id, descendant_id)
     request_store_cache.fetch(cache_key) do
       cache.fetch(cache_key) do
         raw_repository.ancestor?(ancestor_id, descendant_id)
@@ -1016,6 +1016,12 @@ class Repository
     end
   end
 
+  def expire_ancestor_cache(ancestor_id, descendant_id)
+    cache_key = ancestor_cache_key(ancestor_id, descendant_id)
+    request_store_cache.expire(cache_key)
+    cache.expire(cache_key)
+  end
+
   def clone_as_mirror(url, http_authorization_header: "", resolved_address: "")
     import_repository(url, http_authorization_header: http_authorization_header, mirror: true, resolved_address: resolved_address)
   end
@@ -1236,6 +1242,10 @@ class Repository
 
   private
 
+  def ancestor_cache_key(ancestor_id, descendant_id)
+    "ancestor:#{ancestor_id}:#{descendant_id}"
+  end
+
   # TODO Genericize finder, later split this on finders by Ref or Oid
   # https://gitlab.com/gitlab-org/gitlab/issues/19877
   def find_commit(oid_or_ref)