From c787c1559e9e558b83e78354823eb54b9fe8c718 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 13 Aug 2020 18:10:36 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 config/dependency_decisions.yml | 7 +++++++
 config/webpack.vendor.config.js | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 790b09c1dfa..d6386329d83 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -639,3 +639,10 @@
     :why: MIT license
     :versions: []
     :when: 2020-07-28 20:35:27.574875000 Z
+- - :license
+  - dompurify
+  - Apache-2.0
+  - :who: Lukas Eipert
+    :why: "https://github.com/cure53/DOMPurify/blob/main/LICENSE and https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31928#note_346604841"
+    :versions: []
+    :when: 2020-08-13 13:42:46.508082000 Z
diff --git a/config/webpack.vendor.config.js b/config/webpack.vendor.config.js
index 548eca4200f..29c4c33314e 100644
--- a/config/webpack.vendor.config.js
+++ b/config/webpack.vendor.config.js
@@ -40,7 +40,7 @@ module.exports = {
       'select2',
       'moment-mini',
       'aws-sdk',
-      'sanitize-html',
+      'dompurify',
       'bootstrap/dist/js/bootstrap.js',
       'sortablejs/modular/sortable.esm.js',
       'popper.js',
-- 
cgit v1.2.3