Merge branch 'mermaid-js-fix' into 'master'

Don't render mermaid diagrams in search result

Closes #35962

See merge request gitlab-org/gitlab!23033

app/assets/javascripts/behaviors/markdown/render_mermaid.js

@@ -21,6 +21,9 @@ const MAX_CHAR_LIMIT = 5000;
 export default function renderMermaid($els) {
   if (!$els.length) return;
 
+  // A diagram may have been truncated in search results which will cause errors, so abort the render.
+  if (document.querySelector('body').dataset.page === 'search:show') return;
+
   import(/* webpackChunkName: 'mermaid' */ 'mermaid')
     .then(mermaid => {
       mermaid.initialize({