From 16fc54e109bb51be078415f2a4dd256f023c68fa Mon Sep 17 00:00:00 2001
From: Mohammed Bilal <mdbilal@disroot.org>
Date: Sun, 4 Sep 2022 06:12:58 +0530
Subject: [PATCH] Refresh patches

---
 debian/patches/Gemfile/0010-relax-stable-libs.patch   | 9 +++++----
 debian/patches/nodejs/0040-use-packaged-modules.patch | 7 ++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/patches/Gemfile/0010-relax-stable-libs.patch b/debian/patches/Gemfile/0010-relax-stable-libs.patch
index b84d3339ef..58d01367c0 100644
--- a/debian/patches/Gemfile/0010-relax-stable-libs.patch
+++ b/debian/patches/Gemfile/0010-relax-stable-libs.patch
@@ -491,23 +491,24 @@ gitlab Gemfile
  
  # Locked as long as quoted-printable encoding issues are not resolved
  # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
-@@ -531,11 +531,11 @@
+@@ -531,12 +531,11 @@
  gem 'valid_email', '~> 0.1'
  
  # JSON
 -gem 'json', '~> 2.5.1'
 +gem 'json', '~> 2.5', '>= 2.5.1'
  gem 'json_schemer', '~> 0.2.18'
--gem 'oj', '~> 3.13.20'
+-gem 'oj', '~> 3.13.21'
 -gem 'multi_json', '~> 1.14.1'
 -gem 'yajl-ruby', '~> 1.4.3', require: 'yajl'
+-
 +gem 'oj', '~> 3.13', '>= 3.13.20'
 +gem 'multi_json', '~> 1.14', '>= 1.14.1'
 +gem 'yajl-ruby', '~> 1.4','>= 1.4.3', require: 'yajl'
- 
  gem 'webauthn', '~> 2.3'
  
-@@ -546,7 +546,7 @@
+ # IPAddress utilities
+@@ -546,7 +545,7 @@
  
  gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'
  
diff --git a/debian/patches/nodejs/0040-use-packaged-modules.patch b/debian/patches/nodejs/0040-use-packaged-modules.patch
index 4f5a86cb33..a2856afb43 100644
--- a/debian/patches/nodejs/0040-use-packaged-modules.patch
+++ b/debian/patches/nodejs/0040-use-packaged-modules.patch
@@ -102,7 +102,7 @@ Use debian packaged node modules when available
  
 --- a/package.json
 +++ b/package.json
-@@ -47,14 +47,14 @@
+@@ -47,15 +47,15 @@
    "dependencies": {
      "@_ueberdosis/prosemirror-tables": "^1.1.3",
      "@apollo/client": "^3.5.10",
@@ -110,6 +110,7 @@ Use debian packaged node modules when available
 -    "@babel/preset-env": "^7.18.2",
 +    "@babel/core": "link:/usr/share/nodejs/@babel/core",
 +    "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
+     "@codesandbox/sandpack-client": "^1.2.2",
      "@gitlab/at.js": "1.5.7",
      "@gitlab/favicon-overlay": "2.0.0",
      "@gitlab/svgs": "3.1.0",
@@ -120,7 +121,7 @@ Use debian packaged node modules when available
      "@rails/ujs": "6.1.4-7",
      "@sentry/browser": "5.30.0",
      "@sourcegraph/code-host-integration": "0.0.60",
-@@ -92,23 +92,23 @@
+@@ -93,23 +93,23 @@
      "autosize": "^5.0.1",
      "axios": "^0.24.0",
      "babel-loader": "^8.2.5",
@@ -151,7 +152,7 @@ Use debian packaged node modules when available
      "deckar01-task_list": "^2.3.1",
      "diff": "^3.4.0",
      "dompurify": "^2.3.10",
-@@ -126,30 +126,30 @@
+@@ -127,30 +127,30 @@
      "jed": "^1.1.1",
      "jquery": "^3.6.0",
      "jquery.caret": "^0.3.1",