1 files changed, 6 insertions, 3 deletions
diff --git a/app/models/concerns/cache_markdown_field.rb b/app/models/concerns/cache_markdown_field.rb
index a5cf947ba07..101bff32dfe 100644
--- a/app/models/concerns/cache_markdown_field.rb
+++ b/app/models/concerns/cache_markdown_field.rb
@@ -27,7 +27,7 @@ module CacheMarkdownField
   # Returns the default Banzai render context for the cached markdown field.
   def banzai_render_context(field)
     raise ArgumentError, "Unknown field: #{field.inspect}" unless
-      cached_markdown_fields.markdown_fields.include?(field)
+      cached_markdown_fields.key?(field)
 
     # Always include a project key, or Banzai complains
     project = self.project if self.respond_to?(:project)
@@ -100,7 +100,7 @@ module CacheMarkdownField
 
   def cached_html_for(markdown_field)
     raise ArgumentError, "Unknown field: #{markdown_field}" unless
-      cached_markdown_fields.markdown_fields.include?(markdown_field)
+      cached_markdown_fields.key?(markdown_field)
 
     __send__(cached_markdown_fields.html_field(markdown_field)) # rubocop:disable GitlabSecurity/PublicSend
   end
@@ -108,7 +108,7 @@ module CacheMarkdownField
   # Updates the markdown cache if necessary, then returns the field
   # Unlike `cached_html_for` it returns `nil` if the field does not exist
   def updated_cached_html_for(markdown_field)
-    return unless cached_markdown_fields.markdown_fields.include?(markdown_field)
+    return unless cached_markdown_fields.key?(markdown_field)
 
     if attribute_invalidated?(cached_markdown_fields.html_field(markdown_field))
       # Invalidated due to Markdown content change
@@ -157,6 +157,9 @@ module CacheMarkdownField
   end
 
   def store_mentions!
+    # We can only store mentions if the mentionable is a database object
+    return unless self.is_a?(ApplicationRecord)
+
     refs = all_references(self.author)
 
     references = {}