From 7f41c899707880601b61243924775f24b453f235 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sat, 16 Jul 2022 20:22:05 +0200
Subject: [PATCH] Refresh patches

---
 .../Gemfile/0010-relax-stable-libs.patch      |  46 ++--
 .../0020-remove-development-test.patch        |   5 +-
 debian/patches/Gemfile/0050-relax-rdoc.patch  |   2 +-
 .../0070-embed-elasticsearch-model.patch      |  13 --
 .../0080-embed-elasticsearch-rails.patch      |  13 --
 .../Gemfile/0090-remove-ee-only-gems.patch    |  12 +-
 .../patches/Gemfile/0120-relax-capybara.patch |   2 +-
 .../0130-remove-capybara-screenshot.patch     |   2 +-
 .../Gemfile/0140-remove-guard-rspec.patch     |   2 +-
 .../Gemfile/0150-relax-graphlient.patch       |  13 --
 debian/patches/Gemfile/0190-relax-rdoc.patch  |   4 +-
 .../Gemfile/0200-add-gitlab-dangerfiles.patch |   4 +-
 .../nodejs/0020-remove-dev-dependencies.patch |  16 +-
 .../nodejs/0040-use-packaged-modules.patch    |  27 +--
 ...atching-monaco-editor-webpack-plugin.patch |   4 +-
 .../patches/nodejs/0060-use-js-cookie-3.patch | 221 ------------------
 debian/patches/series                         |   4 -
 17 files changed, 58 insertions(+), 332 deletions(-)
 delete mode 100644 debian/patches/Gemfile/0070-embed-elasticsearch-model.patch
 delete mode 100644 debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch
 delete mode 100644 debian/patches/Gemfile/0150-relax-graphlient.patch
 delete mode 100644 debian/patches/nodejs/0060-use-js-cookie-3.patch

diff --git a/debian/patches/Gemfile/0010-relax-stable-libs.patch b/debian/patches/Gemfile/0010-relax-stable-libs.patch
index 5454d22e8f..8750440806 100644
--- a/debian/patches/Gemfile/0010-relax-stable-libs.patch
+++ b/debian/patches/Gemfile/0010-relax-stable-libs.patch
@@ -3,15 +3,15 @@ gitlab Gemfile
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -2,62 +2,62 @@
+@@ -2,61 +2,61 @@
  
  source 'https://rubygems.org'
  
 -gem 'rails', '~> 6.1.4.7'
 +gem 'rails', '~> 6.1.4', '>= 6.1.4.7'
  
--gem 'bootsnap', '~> 1.9.1', require: false
-+gem 'bootsnap', '~> 1.9', '>= 1.9.1', require: false
+-gem 'bootsnap', '~> 1.9.4', require: false
++gem 'bootsnap', '~> 1.9', '>= 1.9.4', require: false
  
  # Responders respond_to and respond_with
  gem 'responders', '~> 3.0'
@@ -69,7 +69,6 @@ gitlab Gemfile
 -gem 'omniauth-gitlab', '~> 1.0.2'
 +gem 'omniauth-gitlab', '~> 1.0','>= 1.0.2'
  gem 'omniauth-google-oauth2', '~> 0.6.0'
- gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
  gem 'omniauth-oauth2-generic', '~> 0.2.2'
  gem 'omniauth-saml', '~> 1.10'
 -gem 'omniauth-shibboleth', '~> 1.3.0'
@@ -138,7 +137,7 @@ gitlab Gemfile
 -gem 'apollo_upload_server', '~> 2.1.0'
 +gem 'apollo_upload_server', '~> 2.1'
  gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
- gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
+ gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
  
 @@ -114,23 +114,23 @@
  gem 'kaminari', '~> 1.0'
@@ -176,10 +175,10 @@ gitlab Gemfile
 +gem 'seed-fu', '~> 2.3','>= 2.3.7'
  
  # Search
- gem 'elasticsearch-model', '~> 6.1'
- gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
--gem 'elasticsearch-api',   '~> 6.8.2'
-+gem 'elasticsearch-api',   '~> 6.8','>= 6.8.2'
+ gem 'elasticsearch-model', '~> 7.2'
+ gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
+-gem 'elasticsearch-api',   '7.13.3'
++gem 'elasticsearch-api',   '~> 7.13', '>= 7.13.3'
  gem 'aws-sdk-core', '~> 3'
  gem 'aws-sdk-cloudformation', '~> 1'
  gem 'aws-sdk-s3', '~> 1'
@@ -205,9 +204,8 @@ gitlab Gemfile
 +gem 'rdoc', '~> 6.3','>= 6.3.2'
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
--gem 'wikicloth', '0.8.1'
+ gem 'wikicloth', '0.8.1'
 -gem 'asciidoctor', '~> 2.0.10'
-+gem 'wikicloth', '~> 0.8.1'
 +gem 'asciidoctor', '~> 2.0','>= 2.0.10'
  gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
  gem 'asciidoctor-plantuml', '~> 0.0.12'
@@ -387,7 +385,7 @@ gitlab Gemfile
  
  group :development do
    gem 'lefthook', '~> 0.7.0', require: false
-@@ -423,22 +423,22 @@
+@@ -424,22 +424,22 @@
  end
  
  group :test do
@@ -419,7 +417,7 @@ gitlab Gemfile
    gem 'rspec_junit_formatter'
    gem 'guard-rspec'
  
-@@ -455,7 +455,7 @@
+@@ -456,7 +456,7 @@
  gem 'email_reply_trimmer', '~> 0.1'
  gem 'html2text'
  
@@ -428,7 +426,7 @@ gitlab Gemfile
  gem 'stackprof', '~> 0.2.15', require: false
  gem 'rbtrace', '~> 0.4', require: false
  gem 'memory_profiler', '~> 0.9', require: false
-@@ -469,8 +469,8 @@
+@@ -470,8 +470,8 @@
  gem 'health_check', '~> 3.0'
  
  # System information
@@ -439,13 +437,7 @@ gitlab Gemfile
  
  # NTP client
  gem 'net-ntp'
-@@ -482,14 +482,14 @@
- gem 'spamcheck', '~> 0.1.0'
- 
- # Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 14.10.0-rc1'
-+gem 'gitaly', '~> 14.10'
- 
+@@ -488,9 +488,9 @@
  # KAS GRPC protocol definitions
  gem 'kas-grpc', '~> 0.0.2'
  
@@ -457,7 +449,7 @@ gitlab Gemfile
  
  gem 'toml-rb', '~> 2.0'
  
-@@ -497,7 +497,7 @@
+@@ -498,7 +498,7 @@
  gem 'flipper', '~> 0.21.0'
  gem 'flipper-active_record', '~> 0.21.0'
  gem 'flipper-active_support_cache_store', '~> 0.21.0'
@@ -466,7 +458,7 @@ gitlab Gemfile
  gem 'gitlab-experiment', '~> 0.7.1'
  
  # Structured logging
-@@ -510,12 +510,12 @@
+@@ -511,12 +511,12 @@
  # Countries list
  gem 'countries', '~> 3.0'
  
@@ -481,7 +473,7 @@ gitlab Gemfile
  
  # Locked as long as quoted-printable encoding issues are not resolved
  # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
-@@ -530,11 +530,11 @@
+@@ -531,11 +531,11 @@
  gem 'valid_email', '~> 0.1'
  
  # JSON
@@ -497,9 +489,9 @@ gitlab Gemfile
  
  gem 'webauthn', '~> 2.3'
  
-@@ -543,4 +543,4 @@
+@@ -544,4 +544,4 @@
  
  gem 'parslet', '~> 1.8'
  
--gem 'ipynbdiff', '0.4.5'
-+gem 'ipynbdiff', '~> 0.4.5'
+-gem 'ipynbdiff', '0.4.7'
++gem 'ipynbdiff', '~> 0.4.7'
diff --git a/debian/patches/Gemfile/0020-remove-development-test.patch b/debian/patches/Gemfile/0020-remove-development-test.patch
index 91da8f1adc..9da9a8dd2f 100644
--- a/debian/patches/Gemfile/0020-remove-development-test.patch
+++ b/debian/patches/Gemfile/0020-remove-development-test.patch
@@ -7,7 +7,7 @@ Bundler will fail when it can't find these locally
  gem 'graphiql-rails', '~> 1.8'
  gem 'apollo_upload_server', '~> 2.1'
 -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
- gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
+ gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie'
 @@ -326,7 +325,6 @@
@@ -18,12 +18,13 @@ Bundler will fail when it can't find these locally
  
  gem 'batch-loader', '~> 2.0', '>= 2.0.1'
  
-@@ -343,85 +341,6 @@
+@@ -343,86 +341,6 @@
  
  gem 'warning', '~> 1.2'
  
 -group :development do
 -  gem 'lefthook', '~> 0.7.0', require: false
+-  gem 'rubocop'
 -  gem 'solargraph', '~> 0.44.3', require: false
 -
 -  gem 'letter_opener_web', '~> 2.0.0'
diff --git a/debian/patches/Gemfile/0050-relax-rdoc.patch b/debian/patches/Gemfile/0050-relax-rdoc.patch
index 7405093b23..7d170b4395 100644
--- a/debian/patches/Gemfile/0050-relax-rdoc.patch
+++ b/debian/patches/Gemfile/0050-relax-rdoc.patch
@@ -10,4 +10,4 @@ Allow rdoc from ruby 2.5 to match requirement
 +gem 'rdoc', '~> 6.0'
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
- gem 'wikicloth', '~> 0.8.1'
+ gem 'wikicloth', '0.8.1'
diff --git a/debian/patches/Gemfile/0070-embed-elasticsearch-model.patch b/debian/patches/Gemfile/0070-embed-elasticsearch-model.patch
deleted file mode 100644
index 6f726562da..0000000000
--- a/debian/patches/Gemfile/0070-embed-elasticsearch-model.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Embed this gem until gitlab moved to 7.x version
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -141,7 +141,7 @@
- gem 'seed-fu', '~> 2.3','>= 2.3.7'
- 
- # Search
--gem 'elasticsearch-model', '~> 6.1'
-+gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
- gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
- gem 'elasticsearch-api',   '~> 6.8','>= 6.8.2'
- gem 'aws-sdk-core', '~> 3'
diff --git a/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch b/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch
deleted file mode 100644
index 39f5ea40a7..0000000000
--- a/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Embed this gem until gitlab moved to 7.x version
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -142,7 +142,7 @@
- 
- # Search
- gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
--gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
-+gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
- gem 'elasticsearch-api',   '~> 6.8','>= 6.8.2'
- gem 'aws-sdk-core', '~> 3'
- gem 'aws-sdk-cloudformation', '~> 1'
diff --git a/debian/patches/Gemfile/0090-remove-ee-only-gems.patch b/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
index 2390da6c15..cfacea7616 100644
--- a/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
+++ b/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
@@ -2,17 +2,15 @@ This gem is used only in gitlab Enterprise Edition
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -59,9 +59,6 @@
- gem 'rack-oauth2', '~> 1.16'
+@@ -59,7 +59,6 @@
  gem 'jwt', '~> 2.1'
  
--# Kerberos authentication. EE-only
+ # Kerberos authentication. EE-only
 -gem 'gssapi', group: :kerberos
--
+ gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
+ 
  # Spam and anti-bot protection
- gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
- gem 'akismet', '~> 3.0'
-@@ -297,8 +294,6 @@
+@@ -297,8 +296,6 @@
  gem 'request_store', '~> 1.5'
  gem 'base32', '~> 0.3.0'
  
diff --git a/debian/patches/Gemfile/0120-relax-capybara.patch b/debian/patches/Gemfile/0120-relax-capybara.patch
index b5f3f6be36..90988f43c9 100644
--- a/debian/patches/Gemfile/0120-relax-capybara.patch
+++ b/debian/patches/Gemfile/0120-relax-capybara.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -343,7 +343,7 @@
+@@ -345,7 +345,7 @@
    gem 'rspec-benchmark', '~> 0.6.0'
    gem 'rspec-parameterized', require: false
  
diff --git a/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch b/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch
index 8cd081cbc0..b678232729 100644
--- a/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch
+++ b/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -344,7 +344,6 @@
+@@ -346,7 +346,6 @@
    gem 'rspec-parameterized', require: false
  
    gem 'capybara', '~> 3.12'
diff --git a/debian/patches/Gemfile/0140-remove-guard-rspec.patch b/debian/patches/Gemfile/0140-remove-guard-rspec.patch
index 604301015c..f49512e43c 100644
--- a/debian/patches/Gemfile/0140-remove-guard-rspec.patch
+++ b/debian/patches/Gemfile/0140-remove-guard-rspec.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -353,7 +353,6 @@
+@@ -355,7 +355,6 @@
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 1.0', '>= 1.0.7'
    gem 'rspec_junit_formatter'
diff --git a/debian/patches/Gemfile/0150-relax-graphlient.patch b/debian/patches/Gemfile/0150-relax-graphlient.patch
deleted file mode 100644
index 7dd09bf28b..0000000000
--- a/debian/patches/Gemfile/0150-relax-graphlient.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-newer version is in the archive
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -100,7 +100,7 @@
- gem 'graphql', '~> 1.11', '>= 1.11.10'
- gem 'graphiql-rails', '~> 1.8'
- gem 'apollo_upload_server', '~> 2.1'
--gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
-+gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
- 
- gem 'hashie'
- # Disable strong_params so that Mash does not respond to :permitted?
diff --git a/debian/patches/Gemfile/0190-relax-rdoc.patch b/debian/patches/Gemfile/0190-relax-rdoc.patch
index 5233923d61..a71c44bd8c 100644
--- a/debian/patches/Gemfile/0190-relax-rdoc.patch
+++ b/debian/patches/Gemfile/0190-relax-rdoc.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -158,7 +158,7 @@
+@@ -160,7 +160,7 @@
  gem 'commonmarker', '~> 0.23.4'
  gem 'kramdown', '~> 2.3','>= 2.3.1'
  gem 'RedCloth', '~> 4.3','>= 4.3.2'
@@ -8,4 +8,4 @@
 +gem 'rdoc'
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
- gem 'wikicloth', '~> 0.8.1'
+ gem 'wikicloth', '0.8.1'
diff --git a/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch b/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch
index 49835658d8..63c0f821e0 100644
--- a/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch
+++ b/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch
@@ -2,10 +2,10 @@ Rakefile need this gem
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -459,3 +459,6 @@
+@@ -461,3 +461,6 @@
  gem 'parslet', '~> 1.8'
  
- gem 'ipynbdiff', '~> 0.4.5'
+ gem 'ipynbdiff', '~> 0.4.7'
 +
 +# This is required for Rakefile
 +gem 'gitlab-dangerfiles'
diff --git a/debian/patches/nodejs/0020-remove-dev-dependencies.patch b/debian/patches/nodejs/0020-remove-dev-dependencies.patch
index 82c6775eb7..d7c70815ed 100644
--- a/debian/patches/nodejs/0020-remove-dev-dependencies.patch
+++ b/debian/patches/nodejs/0020-remove-dev-dependencies.patch
@@ -2,14 +2,14 @@ These are not required in production
 
 --- a/package.json
 +++ b/package.json
-@@ -202,64 +202,6 @@
+@@ -204,65 +204,7 @@
      "yaml": "^2.0.0-10"
    },
    "devDependencies": {
 -    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
--    "@gitlab/eslint-plugin": "12.0.1",
+-    "@gitlab/eslint-plugin": "12.1.0",
 -    "@gitlab/stylelint-config": "4.0.0",
--    "@graphql-eslint/eslint-plugin": "3.0.0",
+-    "@graphql-eslint/eslint-plugin": "3.10.2",
 -    "@testing-library/dom": "^7.16.2",
 -    "@types/jest": "^26.0.24",
 -    "@vue/test-utils": "1.3.0",
@@ -53,17 +53,19 @@ These are not required in production
 -    "prettier": "2.2.1",
 -    "prosemirror-schema-basic": "^1.1.2",
 -    "prosemirror-schema-list": "^1.1.6",
--    "prosemirror-test-builder": "^1.0.5",
+-    "prosemirror-test-builder": "^1.0.6",
 -    "purgecss": "^4.0.3",
 -    "purgecss-from-html": "^4.0.3",
 -    "sass": "^1.32.12",
 -    "stylelint": "^14.3.0",
 -    "timezone-mock": "^1.0.8",
 -    "vue-jest": "4.0.1",
--    "webpack-dev-server": "4.8.1",
+-    "webpack-dev-server": "4.9.0",
 -    "xhr-mock": "^2.5.1",
 -    "yarn-check-webpack-plugin": "^1.2.0",
--    "yarn-deduplicate": "^4.0.0"
-   },
+-    "yarn-deduplicate": "^5.0.0"
+-  },
++     },
    "blockedDependencies": {
      "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
+   },
diff --git a/debian/patches/nodejs/0040-use-packaged-modules.patch b/debian/patches/nodejs/0040-use-packaged-modules.patch
index 08c060b60d..431fec37a7 100644
--- a/debian/patches/nodejs/0040-use-packaged-modules.patch
+++ b/debian/patches/nodejs/0040-use-packaged-modules.patch
@@ -130,9 +130,9 @@ Use debian packaged node modules when available
 +    "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
      "@gitlab/at.js": "1.5.7",
      "@gitlab/favicon-overlay": "2.0.0",
-     "@gitlab/svgs": "2.8.0",
-     "@gitlab/ui": "38.8.1",
-     "@gitlab/visual-review-tools": "1.6.1",
+     "@gitlab/svgs": "2.14.0",
+     "@gitlab/ui": "40.2.1",
+     "@gitlab/visual-review-tools": "1.7.3",
 -    "@rails/actioncable": "6.1.4-7",
 +    "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
      "@rails/ujs": "6.1.4-7",
@@ -141,7 +141,7 @@ Use debian packaged node modules when available
 @@ -100,24 +100,24 @@
      "aws-sdk": "^2.637.0",
      "axios": "^0.24.0",
-     "babel-loader": "^8.2.4",
+     "babel-loader": "^8.2.5",
 -    "babel-plugin-lodash": "^3.3.4",
 +    "babel-plugin-lodash": "link:/usr/share/nodejs/babel-plugin-lodash",
      "bootstrap": "4.5.3",
@@ -154,7 +154,7 @@ Use debian packaged node modules when available
      "codesandbox-api": "0.0.23",
      "compression-webpack-plugin": "^5.0.2",
      "copy-webpack-plugin": "^6.4.1",
-     "core-js": "^3.22.0",
+     "core-js": "^3.22.5",
 -    "cron-validator": "^1.1.1",
 +    "cron-validator": "link:/usr/share/nodejs/cron-validator",
      "cronstrue": "^1.122.0",
@@ -170,12 +170,12 @@ Use debian packaged node modules when available
 +    "dateformat": "link:/usr/share/nodejs/dateformat",
      "deckar01-task_list": "^2.3.1",
      "diff": "^3.4.0",
-     "dompurify": "^2.3.6",
-@@ -135,33 +135,33 @@
+     "dompurify": "^2.3.8",
+@@ -136,31 +136,31 @@
      "jed": "^1.1.1",
      "jquery": "^3.6.0",
      "jquery.caret": "^0.3.1",
--    "js-cookie": "^2.2.1",
+-    "js-cookie": "^3.0.0",
 -    "js-yaml": "^3.13.1",
 +    "js-cookie": "link:/usr/share/nodejs/js-cookie",
 +    "js-yaml": "link:/usr/share/nodejs/js-yaml",
@@ -189,9 +189,8 @@ Use debian packaged node modules when available
      "lowlight": "^2.5.0",
      "marked": "^0.3.12",
      "mathjax": "3",
--    "mermaid": "^8.13.10",
+     "mermaid": "^9.1.1",
 -    "minimatch": "^3.0.4",
-+    "mermaid": "link:/usr/share/nodejs/mermaid",
 +    "minimatch": "link:/usr/share/nodejs/minimatch",
      "monaco-editor": "^0.25.2",
      "monaco-editor-webpack-plugin": "^4.0.0",
@@ -214,12 +213,9 @@ Use debian packaged node modules when available
 +    "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
 +    "prosemirror-state": "link:/usr/share/nodejs/prosemirror-state",
      "prosemirror-tables": "^1.1.1",
--    "prosemirror-view": "^1.23.10",
-+    "prosemirror-view": "link:/usr/share/nodejs/prosemirror-view",
+     "prosemirror-view": "^1.23.13",
      "raphael": "^2.2.7",
-     "raw-loader": "^4.0.2",
-     "rehype-raw": "^6.1.1",
-@@ -175,26 +175,25 @@
+@@ -176,27 +176,26 @@
      "style-loader": "^2.0.0",
      "swagger-ui-dist": "4.8.0",
      "three": "^0.84.0",
@@ -229,6 +225,7 @@ Use debian packaged node modules when available
 -    "timeago.js": "^4.0.2",
 +    "timeago.js": "link:/usr/share/nodejs/timeago.js",
      "unified": "^10.1.2",
+     "unist-util-visit-parents": "^5.1.0",
      "url-loader": "^4.1.1",
 -    "uuid": "8.1.0",
 +    "uuid": "link:/usr/share/nodejs/uuid",
diff --git a/debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch b/debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch
index 3a26a4c631..37d5a06aa2 100644
--- a/debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch
+++ b/debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch
@@ -2,8 +2,8 @@
 
 --- a/package.json
 +++ b/package.json
-@@ -147,7 +147,7 @@
-     "mermaid": "link:/usr/share/nodejs/mermaid",
+@@ -148,7 +148,7 @@
+     "mermaid": "^9.1.1",
      "minimatch": "link:/usr/share/nodejs/minimatch",
      "monaco-editor": "^0.25.2",
 -    "monaco-editor-webpack-plugin": "^4.0.0",
diff --git a/debian/patches/nodejs/0060-use-js-cookie-3.patch b/debian/patches/nodejs/0060-use-js-cookie-3.patch
deleted file mode 100644
index 062dd069cf..0000000000
--- a/debian/patches/nodejs/0060-use-js-cookie-3.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 810896fdaccdba0e76e5062474420c6ce85493c3 Mon Sep 17 00:00:00 2001
-From: Pirate Praveen <praveen@debian.org>
-Date: Wed, 20 Apr 2022 14:32:07 +0000
-Subject: [PATCH] Update node module js-cookies from ^2.2.1 to ^3.0.0
-
----
- app/assets/javascripts/lib/utils/common_utils.js          | 2 +-
- app/assets/javascripts/lib/utils/cookies.js               | 8 ++++++++
- app/assets/javascripts/main.js                            | 4 ----
- .../javascripts/work_items_hierarchy/components/app.vue   | 2 +-
- .../components/qrtly_reconciliation_alert.vue             | 2 +-
- .../components/qrtly_reconciliation_alert_spec.js         | 4 ++--
- ee/spec/frontend/ee_trial_banner/ee_trial_banner_spec.js  | 2 +-
- ee/spec/frontend/epic/utils/epic_utils_spec.js            | 2 +-
- ee/spec/frontend/namespace_storage_limit_alert_spec.js    | 2 +-
- ee/spec/frontend/namespace_user_cap_reached_alert_spec.js | 2 +-
- .../project/project_vulnerability_report_spec.js          | 2 +-
- ee/spec/frontend/vulnerabilities/resolution_alert_spec.js | 2 +-
- package.json                                              | 2 +-
- spec/frontend/awards_handler_spec.js                      | 2 +-
- spec/frontend/blob/pipeline_tour_success_modal_spec.js    | 2 +-
- spec/frontend/broadcast_notification_spec.js              | 2 +-
- .../design_management/components/design_sidebar_spec.js   | 2 +-
- spec/frontend/diffs/store/actions_spec.js                 | 2 +-
- spec/frontend/emoji/components/utils_spec.js              | 4 ++--
- spec/frontend/groups/landing_spec.js                      | 2 +-
- spec/frontend/merge_conflicts/store/actions_spec.js       | 4 ++--
- .../projects/learn_gitlab/components/learn_gitlab_spec.js | 2 +-
- .../shared/components/pipeline_schedule_callout_spec.js   | 2 +-
- .../sidebar/components/issuable_sidebar_root_spec.js      | 2 +-
- yarn.lock                                                 | 8 ++++----
- 25 files changed, 37 insertions(+), 33 deletions(-)
- create mode 100644 app/assets/javascripts/lib/utils/cookies.js
-
---- a/app/assets/javascripts/lib/utils/common_utils.js
-+++ b/app/assets/javascripts/lib/utils/common_utils.js
-@@ -4,8 +4,8 @@
- 
- import { GlBreakpointInstance as breakpointInstance } from '@gitlab/ui/dist/utils';
- import $ from 'jquery';
--import Cookies from 'js-cookie';
- import { isFunction, defer } from 'lodash';
-+import Cookies from '~/lib/utils/cookies';
- import { SCOPED_LABEL_DELIMITER } from '~/vue_shared/components/sidebar/labels_select_widget/constants';
- import { convertToCamelCase, convertToSnakeCase } from './text_utility';
- import { isObject } from './type_utility';
---- /dev/null
-+++ b/app/assets/javascripts/lib/utils/cookies.js
-@@ -0,0 +1,8 @@
-+import CookiesBuilder from 'js-cookie';
-+
-+// set default path for cookies
-+const Cookies = CookiesBuilder.withAttributes({
-+  path: gon.relative_url_root || '/',
-+});
-+
-+export default Cookies;
---- a/app/assets/javascripts/main.js
-+++ b/app/assets/javascripts/main.js
-@@ -1,7 +1,6 @@
- /* global $ */
- 
- import jQuery from 'jquery';
--import Cookies from 'js-cookie';
- 
- // bootstrap webpack, common libs, polyfills, and behaviors
- import './webpack';
-@@ -178,9 +177,6 @@
- initLayoutNav();
- initAlertHandler();
- 
--// Set the default path for all cookies to GitLab's root directory
--Cookies.defaults.path = gon.relative_url_root || '/';
--
- // `hashchange` is not triggered when link target is already in window.location
- $body.on('click', 'a[href^="#"]', function clickHashLinkCallback() {
-   const href = this.getAttribute('href');
---- a/app/assets/javascripts/work_items_hierarchy/components/app.vue
-+++ b/app/assets/javascripts/work_items_hierarchy/components/app.vue
-@@ -1,6 +1,6 @@
- <script>
- import { GlBanner } from '@gitlab/ui';
--import Cookies from 'js-cookie';
-+import Cookies from '~/lib/utils/cookies';
- import { parseBoolean } from '~/lib/utils/common_utils';
- import RESPONSE from '../static_response';
- import { WORK_ITEMS_SURVEY_COOKIE_NAME, workItemTypes } from '../constants';
---- a/spec/frontend/awards_handler_spec.js
-+++ b/spec/frontend/awards_handler_spec.js
-@@ -1,5 +1,5 @@
- import $ from 'jquery';
--import Cookies from 'js-cookie';
-+import Cookies from '~/lib/utils/cookies';
- import { initEmojiMock, clearEmojiMock } from 'helpers/emoji';
- import { useFakeRequestAnimationFrame } from 'helpers/fake_request_animation_frame';
- import loadAwardsHandler from '~/awards_handler';
---- a/spec/frontend/blob/pipeline_tour_success_modal_spec.js
-+++ b/spec/frontend/blob/pipeline_tour_success_modal_spec.js
-@@ -1,6 +1,6 @@
- import { GlSprintf, GlModal, GlLink } from '@gitlab/ui';
- import { shallowMount } from '@vue/test-utils';
--import Cookies from 'js-cookie';
-+import Cookies from '~/lib/utils/cookies';
- import { stubComponent } from 'helpers/stub_component';
- import { mockTracking, triggerEvent, unmockTracking } from 'helpers/tracking_helper';
- import pipelineTourSuccess from '~/blob/pipeline_tour_success_modal.vue';
---- a/spec/frontend/broadcast_notification_spec.js
-+++ b/spec/frontend/broadcast_notification_spec.js
-@@ -1,4 +1,4 @@
--import Cookies from 'js-cookie';
-+import Cookies from '~/lib/utils/cookies';
- import initBroadcastNotifications from '~/broadcast_notification';
- 
- describe('broadcast message on dismiss', () => {
---- a/spec/frontend/design_management/components/design_sidebar_spec.js
-+++ b/spec/frontend/design_management/components/design_sidebar_spec.js
-@@ -1,7 +1,7 @@
- import { GlCollapse, GlPopover } from '@gitlab/ui';
- import { shallowMount } from '@vue/test-utils';
--import Cookies from 'js-cookie';
- import { nextTick } from 'vue';
-+import Cookies from '~/lib/utils/cookies';
- import DesignDiscussion from '~/design_management/components/design_notes/design_discussion.vue';
- import DesignNoteSignedOut from '~/design_management/components/design_notes/design_note_signed_out.vue';
- import DesignSidebar from '~/design_management/components/design_sidebar.vue';
---- a/spec/frontend/diffs/store/actions_spec.js
-+++ b/spec/frontend/diffs/store/actions_spec.js
-@@ -1,5 +1,5 @@
- import MockAdapter from 'axios-mock-adapter';
--import Cookies from 'js-cookie';
-+import Cookies from '~/lib/utils/cookies';
- import { useLocalStorageSpy } from 'helpers/local_storage_helper';
- import { TEST_HOST } from 'helpers/test_constants';
- import testAction from 'helpers/vuex_action_helper';
---- a/spec/frontend/emoji/components/utils_spec.js
-+++ b/spec/frontend/emoji/components/utils_spec.js
-@@ -1,7 +1,7 @@
--import Cookies from 'js-cookie';
-+import Cookies from '~/lib/utils/cookies';
- import { getFrequentlyUsedEmojis, addToFrequentlyUsed } from '~/emoji/components/utils';
- 
--jest.mock('js-cookie');
-+jest.mock('~/lib/utils/cookies');
- 
- describe('getFrequentlyUsedEmojis', () => {
-   it('it returns null when no saved emojis set', () => {
---- a/spec/frontend/groups/landing_spec.js
-+++ b/spec/frontend/groups/landing_spec.js
-@@ -1,4 +1,4 @@
--import Cookies from 'js-cookie';
-+import Cookies from '~/lib/utils/cookies';
- import Landing from '~/groups/landing';
- 
- describe('Landing', () => {
---- a/spec/frontend/merge_conflicts/store/actions_spec.js
-+++ b/spec/frontend/merge_conflicts/store/actions_spec.js
-@@ -1,6 +1,6 @@
- import axios from 'axios';
- import MockAdapter from 'axios-mock-adapter';
--import Cookies from 'js-cookie';
-+import Cookies from '~/lib/utils/cookies';
- import { useMockLocationHelper } from 'helpers/mock_window_location_helper';
- import testAction from 'helpers/vuex_action_helper';
- import createFlash from '~/flash';
-@@ -11,7 +11,7 @@
- 
- jest.mock('~/flash.js');
- jest.mock('~/merge_conflicts/utils');
--jest.mock('js-cookie');
-+jest.mock('~/lib/utils/cookies');
- 
- describe('merge conflicts actions', () => {
-   let mock;
---- a/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_spec.js
-+++ b/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_spec.js
-@@ -1,6 +1,6 @@
- import { GlProgressBar, GlAlert } from '@gitlab/ui';
- import { mount } from '@vue/test-utils';
--import Cookies from 'js-cookie';
-+import Cookies from '~/lib/utils/cookies';
- import LearnGitlab from '~/pages/projects/learn_gitlab/components/learn_gitlab.vue';
- import eventHub from '~/invite_members/event_hub';
- import { INVITE_MODAL_OPEN_COOKIE } from '~/pages/projects/learn_gitlab/constants';
---- a/spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js
-+++ b/spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js
-@@ -1,7 +1,7 @@
- import { GlButton } from '@gitlab/ui';
- import { shallowMount } from '@vue/test-utils';
--import Cookies from 'js-cookie';
- import { nextTick } from 'vue';
-+import Cookies from '~/lib/utils/cookies';
- import PipelineSchedulesCallout from '~/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue';
- 
- const cookieKey = 'pipeline_schedules_callout_dismissed';
---- a/spec/frontend/vue_shared/issuable/sidebar/components/issuable_sidebar_root_spec.js
-+++ b/spec/frontend/vue_shared/issuable/sidebar/components/issuable_sidebar_root_spec.js
-@@ -1,6 +1,6 @@
- import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
--import Cookies from 'js-cookie';
- import { nextTick } from 'vue';
-+import Cookies from '~/lib/utils/cookies';
- import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
- 
- import IssuableSidebarRoot from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -7754,10 +7754,10 @@
-     mkdirp "~1.0.3"
-     nopt "^4.0.3"
- 
--js-cookie@^2.2.1:
--  version "2.2.1"
--  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
--  integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
-+js-cookie@^3.0.0:
-+  version "3.0.1"
-+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
-+  integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
- 
- "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-   version "4.0.0"
diff --git a/debian/patches/series b/debian/patches/series
index e99ee029e5..a33c265598 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,13 +3,10 @@ Gemfile/0020-remove-development-test.patch
 Gemfile/0030-make-test-dependencies-conditional.patch
 Gemfile/0040-relax-httparty.patch
 Gemfile/0050-relax-rdoc.patch
-Gemfile/0070-embed-elasticsearch-model.patch
-Gemfile/0080-embed-elasticsearch-rails.patch
 Gemfile/0090-remove-ee-only-gems.patch
 Gemfile/0120-relax-capybara.patch
 Gemfile/0130-remove-capybara-screenshot.patch
 Gemfile/0140-remove-guard-rspec.patch
-Gemfile/0150-relax-graphlient.patch
 Gemfile/0160-relax-rexml.patch
 Gemfile/0180-add-parser-gem.patch
 Gemfile/0190-relax-rdoc.patch
@@ -19,7 +16,6 @@ nodejs/0020-remove-dev-dependencies.patch
 nodejs/0030-use-yarnpkg.patch
 nodejs/0040-use-packaged-modules.patch
 nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch
-nodejs/0060-use-js-cookie-3.patch
 tweaks/0010-source-init-functions.patch
 tweaks/0020-fix-mail-room-path.patch
 tweaks/0030-fix-gitlab-yml-path.patch