diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
commit | e4384360a16dd9a19d4d2d25d0ef1f2b862ed2a6 (patch) | |
tree | 2fcdfa7dcdb9db8f5208b2562f4b4e803d671243 /patches | |
parent | ffda4e7bcac36987f936b4ba515995a6698698f0 (diff) |
Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42
Diffstat (limited to 'patches')
-rw-r--r-- | patches/@rails+ujs+7.0.6.patch (renamed from patches/@rails+ujs+6.1.4-7.patch) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/@rails+ujs+6.1.4-7.patch b/patches/@rails+ujs+7.0.6.patch index 35669852e9f..65a4eb029b8 100644 --- a/patches/@rails+ujs+6.1.4-7.patch +++ b/patches/@rails+ujs+7.0.6.patch @@ -1,8 +1,8 @@ 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 2176247..1a83d48 100644 +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 -@@ -265,11 +265,6 @@ Released under the MIT license +@@ -281,11 +281,6 @@ Released under the MIT license try { response = JSON.parse(response); } catch (error) {} |