Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 0 deletions

diff --git a/app/assets/javascripts/lib/mermaid.js b/app/assets/javascripts/lib/mermaid.js
index d621c9ddf9e..c72561ce69d 100644
--- a/app/assets/javascripts/lib/mermaid.js
+++ b/app/assets/javascripts/lib/mermaid.js
@@ -9,6 +9,7 @@ const setIframeRenderedSize = (h, w) => {
 const drawDiagram = (source) => {
   const element = document.getElementById('app');
   const insertSvg = (svgCode) => {
+    // eslint-disable-next-line no-unsanitized/property
     element.innerHTML = svgCode;
 
     const height = parseInt(element.firstElementChild.getAttribute('height'), 10);
diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js
index 7b00995b2e5..59645d50e29 100644
--- a/app/assets/javascripts/lib/utils/text_utility.js
+++ b/app/assets/javascripts/lib/utils/text_utility.js
@@ -119,6 +119,7 @@ const getAverageCharWidth = memoize(function getAverageCharWidth(options = {}) {
   div.style.left = -1000;
   div.style.top = -1000;
 
+  // eslint-disable-next-line no-unsanitized/property
   div.innerHTML = chars;
 
   document.body.appendChild(div);