From 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 10 Feb 2020 12:08:59 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/behaviors/markdown/render_mermaid.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/assets/javascripts/behaviors')

diff --git a/app/assets/javascripts/behaviors/markdown/render_mermaid.js b/app/assets/javascripts/behaviors/markdown/render_mermaid.js
index c3e2c09f1d5..c86a4c9f178 100644
--- a/app/assets/javascripts/behaviors/markdown/render_mermaid.js
+++ b/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({
-- 
cgit v1.2.1