Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 0 deletions

diff --git a/app/assets/javascripts/behaviors/copy_code.js b/app/assets/javascripts/behaviors/copy_code.js
index 6d2a4c245cc..a653769b60f 100644
--- a/app/assets/javascripts/behaviors/copy_code.js
+++ b/app/assets/javascripts/behaviors/copy_code.js
@@ -22,6 +22,7 @@ class CopyCodeButton extends HTMLElement {
       'data-clipboard-target': `pre#${this.for}`,
     });
 
+    // eslint-disable-next-line no-unsanitized/property
     button.innerHTML = spriteIcon('copy-to-clipboard');
 
     return button;
diff --git a/app/assets/javascripts/behaviors/markdown/render_math.js b/app/assets/javascripts/behaviors/markdown/render_math.js
index af7aac4cf36..ac41af4df7a 100644
--- a/app/assets/javascripts/behaviors/markdown/render_math.js
+++ b/app/assets/javascripts/behaviors/markdown/render_math.js
@@ -91,6 +91,7 @@ class SafeMathRenderer {
           `;
 
       if (!wrapperElement.classList.contains('lazy-alert-shown')) {
+        // eslint-disable-next-line no-unsanitized/property
         wrapperElement.innerHTML = html;
         wrapperElement.append(codeElement);
         wrapperElement.classList.add('lazy-alert-shown');
@@ -111,6 +112,7 @@ class SafeMathRenderer {
       }
 
       try {
+        // eslint-disable-next-line no-unsanitized/property
         displayContainer.innerHTML = this.katex.renderToString(text, {
           displayMode: el.dataset.mathStyle === 'display',
           throwOnError: true,