From 4e5e33965fe2b22adfa26bc6c7babf67fe357207 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 26 Jun 2023 03:10:45 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 patches/@rails+ujs+7.0.4-3.patch | 16 ----------------
 patches/@rails+ujs+7.0.5.patch   | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 patches/@rails+ujs+7.0.4-3.patch
 create mode 100644 patches/@rails+ujs+7.0.5.patch

(limited to 'patches')

diff --git a/patches/@rails+ujs+7.0.4-3.patch b/patches/@rails+ujs+7.0.4-3.patch
deleted file mode 100644
index 65a4eb029b8..00000000000
--- a/patches/@rails+ujs+7.0.4-3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/node_modules/@rails/ujs/lib/assets/compiled/rails-ujs.js b/node_modules/@rails/ujs/lib/assets/compiled/rails-ujs.js
-index d428163..010eaa5 100644
---- a/node_modules/@rails/ujs/lib/assets/compiled/rails-ujs.js
-+++ b/node_modules/@rails/ujs/lib/assets/compiled/rails-ujs.js
-@@ -281,11 +281,6 @@ Released under the MIT license
-             try {
-               response = JSON.parse(response);
-             } catch (error) {}
--          } else if (type.match(/\b(?:java|ecma)script\b/)) {
--            script = document.createElement('script');
--            script.setAttribute('nonce', cspNonce());
--            script.text = response;
--            document.head.appendChild(script).parentNode.removeChild(script);
-           } else if (type.match(/\b(xml|html|svg)\b/)) {
-             parser = new DOMParser();
-             type = type.replace(/;.+/, '');
diff --git a/patches/@rails+ujs+7.0.5.patch b/patches/@rails+ujs+7.0.5.patch
new file mode 100644
index 00000000000..65a4eb029b8
--- /dev/null
+++ b/patches/@rails+ujs+7.0.5.patch
@@ -0,0 +1,16 @@
+diff --git a/node_modules/@rails/ujs/lib/assets/compiled/rails-ujs.js b/node_modules/@rails/ujs/lib/assets/compiled/rails-ujs.js
+index d428163..010eaa5 100644
+--- a/node_modules/@rails/ujs/lib/assets/compiled/rails-ujs.js
++++ b/node_modules/@rails/ujs/lib/assets/compiled/rails-ujs.js
+@@ -281,11 +281,6 @@ Released under the MIT license
+             try {
+               response = JSON.parse(response);
+             } catch (error) {}
+-          } else if (type.match(/\b(?:java|ecma)script\b/)) {
+-            script = document.createElement('script');
+-            script.setAttribute('nonce', cspNonce());
+-            script.text = response;
+-            document.head.appendChild(script).parentNode.removeChild(script);
+           } else if (type.match(/\b(xml|html|svg)\b/)) {
+             parser = new DOMParser();
+             type = type.replace(/;.+/, '');
-- 
cgit v1.2.3