Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb
index 8799b0b9a80..df181406591 100644
--- a/lib/banzai/filter/relative_link_filter.rb
+++ b/lib/banzai/filter/relative_link_filter.rb
@@ -21,6 +21,7 @@ module Banzai
         return doc if context[:system_note]
 
         clear_memoization(:linkable_files)
+        clear_memoization(:linkable_attributes)
 
         load_uri_types
 
@@ -35,10 +36,9 @@ module Banzai
 
       def load_uri_types
         return unless linkable_files?
+        return unless linkable_attributes.present?
         return {} unless repository
 
-        clear_memoization(:linkable_attributes)
-
         @uri_types = request_path.present? ? get_uri_types([request_path]) : {}
 
         paths = linkable_attributes.flat_map do |attr|