Refresh patches and remove obsolete patches

debian/patches/0510-remove-dev-dependencies.patch

@@ -2,12 +2,12 @@ These are not required in production
 
 --- a/package.json
 +++ b/package.json
-@@ -202,61 +202,7 @@
+@@ -204,61 +204,7 @@
      "xterm": "3.14.5"
    },
    "devDependencies": {
 -    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
--    "@gitlab/eslint-plugin": "9.3.0",
+-    "@gitlab/eslint-plugin": "9.4.0",
 -    "@gitlab/stylelint-config": "2.3.0",
 -    "@testing-library/dom": "^7.16.2",
 -    "@vue/test-utils": "1.2.0",
@@ -22,7 +22,7 @@ These are not required in production
 -    "custom-jquery-matchers": "^2.1.0",
 -    "docdash": "^1.0.2",
 -    "eslint": "7.32.0",
--    "eslint-import-resolver-jest": "3.0.0",
+-    "eslint-import-resolver-jest": "3.0.2",
 -    "eslint-import-resolver-webpack": "0.13.1",
 -    "eslint-plugin-no-jquery": "2.6.0",
 -    "gettext-extractor": "^3.5.3",
@@ -48,7 +48,7 @@ These are not required in production
 -    "postcss": "^7.0.14",
 -    "prettier": "2.2.1",
 -    "prosemirror-schema-basic": "^1.1.2",
--    "prosemirror-schema-list": "^1.1.5",
+-    "prosemirror-schema-list": "^1.1.6",
 -    "prosemirror-test-builder": "^1.0.4",
 -    "purgecss": "^4.0.3",
 -    "purgecss-from-html": "^4.0.3",

debian/patches/0740-use-packaged-modules.patch

@@ -77,7 +77,7 @@ Use debian packaged node modules when available
          loader: 'file-loader',
          options: {
            name: '[name].[contenthash:8].[ext]',
-@@ -635,19 +645,6 @@
+@@ -643,19 +653,6 @@
      // enable HMR only in webpack-dev-server
      DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
  
@@ -97,7 +97,7 @@ Use debian packaged node modules when available
      new webpack.DefinePlugin({
        // These are used to define window.gon.ee, window.gon.jh and other things properly in tests:
        'process.env.IS_EE': JSON.stringify(IS_EE),
-@@ -686,6 +683,7 @@
+@@ -694,6 +691,7 @@
  
    node: {
      fs: 'empty', // sqljs requires fs
@@ -125,16 +125,16 @@ 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": "1.212.0",
+     "@gitlab/svgs": "1.218.0",
      "@gitlab/tributejs": "1.0.0",
-     "@gitlab/ui": "32.11.0",
+     "@gitlab/ui": "32.19.1",
      "@gitlab/visual-review-tools": "1.6.1",
--    "@rails/actioncable": "6.1.3-2",
+-    "@rails/actioncable": "6.1.4-1",
 +    "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
-     "@rails/ujs": "6.1.3-2",
+     "@rails/ujs": "6.1.4-1",
      "@sentry/browser": "5.30.0",
      "@sourcegraph/code-host-integration": "0.0.60",
-@@ -105,7 +105,7 @@
+@@ -106,7 +106,7 @@
      "aws-sdk": "^2.637.0",
      "axios": "^0.20.0",
      "babel-loader": "^8.2.2",
@@ -143,7 +143,7 @@ Use debian packaged node modules when available
      "bootstrap": "4.5.3",
      "cache-loader": "^4.1.0",
      "clipboard": "^1.7.1",
-@@ -138,31 +138,31 @@
+@@ -139,31 +139,31 @@
      "jed": "^1.1.1",
      "jquery": "^3.6.0",
      "jquery.caret": "^0.3.1",
@@ -162,7 +162,7 @@ Use debian packaged node modules when available
      "lowlight": "^1.20.0",
      "marked": "^0.3.12",
      "mathjax": "3",
-     "mermaid": "^8.11.5",
+     "mermaid": "^8.13.2",
 -    "minimatch": "^3.0.4",
 +    "minimatch": "link:/usr/share/nodejs/minimatch",
      "monaco-editor": "^0.25.2",
@@ -178,18 +178,18 @@ Use debian packaged node modules when available
      "portal-vue": "^2.1.7",
      "prismjs": "^1.21.0",
      "prosemirror-inputrules": "^1.1.3",
--    "prosemirror-markdown": "^1.5.2",
+-    "prosemirror-markdown": "^1.6.0",
 -    "prosemirror-model": "^1.14.3",
 -    "prosemirror-state": "^1.3.4",
 +    "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
 +    "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
 +    "prosemirror-state": "link:/usr/share/nodejs/prosemirror-state",
      "prosemirror-tables": "^1.1.1",
+     "prosemirror-view": "^1.20.2",
      "raphael": "^2.2.7",
-     "raw-loader": "^4.0.2",
-@@ -175,27 +175,26 @@
+@@ -177,27 +177,26 @@
      "style-loader": "^2.0.0",
-     "swagger-ui-dist": "^3.44.1",
+     "swagger-ui-dist": "^3.52.3",
      "three": "^0.84.0",
 -    "three-orbit-controls": "^82.1.0",
 +    "three-orbit-controls": "link:/usr/share/nodejs/three-orbit-controls",

debian/patches/0750-use-matching-monaco-editor-webpack-plugin.patch

@@ -2,8 +2,8 @@
 
 --- a/package.json
 +++ b/package.json
-@@ -150,7 +150,7 @@
-     "mermaid": "^8.11.5",
+@@ -151,7 +151,7 @@
+     "mermaid": "^8.13.2",
      "minimatch": "link:/usr/share/nodejs/minimatch",
      "monaco-editor": "^0.25.2",
 -    "monaco-editor-webpack-plugin": "^4.0.0",

debian/patches/0770-remove-capybara-screenshot-rspec.patch

@@ -8,7 +8,7 @@
  require 'selenium-webdriver'
  
  # Give CI some extra time
-@@ -109,18 +108,6 @@
+@@ -110,18 +109,6 @@
  Capybara.default_normalize_ws = true
  Capybara.enable_aria_label = true
  

debian/patches/0810-postgresql-cte-rails-6-1-4.patch

@@ -1,15 +0,0 @@
-Add support for activerecord 6.1.4 using a cherry picked patch
-
-Forwarded: https://github.com/kmurph73/ctes_in_my_pg/commit/eabb5508df56b5dc838547655542a272511af424
-
---- a/config/initializers/postgresql_cte.rb
-+++ b/config/initializers/postgresql_cte.rb
-@@ -96,7 +96,7 @@
-       end
-     end
- 
--    def build_arel(aliases)
-+    def build_arel(aliases = nil)
-       arel = super
- 
-       build_with(arel) if @values[:with]

debian/patches/Gemfile/0010-relax-stable-libs.patch

@@ -7,8 +7,8 @@ gitlab Gemfile
  
  source 'https://rubygems.org'
  
--gem 'rails', '~> 6.1.3.2'
-+gem 'rails', '~> 6.1.3', '>= 6.1.3.2'
+-gem 'rails', '~> 6.1.4.1'
++gem 'rails', '~> 6.1.4', '>= 6.1.4.1'
  
 -gem 'bootsnap', '~> 1.4.6'
 +gem 'bootsnap', '~> 1.4', '>= 1.4.6'
@@ -106,7 +106,7 @@ gitlab Gemfile
  # GitLab Pages letsencrypt support
  gem 'acme-client', '~> 2.0', '>= 2.0.6'
  
-@@ -82,27 +82,27 @@
+@@ -82,7 +82,7 @@
  gem 'ohai', '~> 16.10'
  
  # GPG
@@ -115,15 +115,13 @@ gitlab Gemfile
  
  # LDAP Auth
  # GitLab fork with several improvements to original library. For full list of changes
- # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
--gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
-+gem 'gitlab_omniauth-ldap', '~> 2.1','>= 2.1.1', require: 'omniauth-ldap'
+@@ -91,17 +91,17 @@
  gem 'net-ldap', '~> 0.16.3'
  
  # API
 -gem 'grape', '~> 1.5.2'
 +gem 'grape', '~> 1.5','>= 1.5.2'
- gem 'grape-entity', '~> 0.9.0'
+ gem 'grape-entity', '~> 0.10.0'
 -gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
 +gem 'rack-cors', '~> 1.0','>= 1.0.6', require: 'rack/cors'
  
@@ -135,13 +133,11 @@ gitlab Gemfile
  # https://gitlab.com/gitlab-org/gitlab/issues/31747
 -gem 'graphiql-rails', '~> 1.4.10'
 -gem 'apollo_upload_server', '~> 2.1.0'
--gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
 +gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
 +gem 'apollo_upload_server', '~> 2.1'
-+gem 'graphql-docs', '~> 1.6', group: [:development, :test]
+ gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
- gem 'hashie'
 @@ -113,23 +113,23 @@
  gem 'kaminari', '~> 1.0'
  
@@ -165,8 +161,8 @@ gitlab Gemfile
  gem 'fog-openstack', '~> 1.0'
  gem 'fog-rackspace', '~> 0.1.1'
  gem 'fog-aliyun', '~> 0.3'
--gem 'gitlab-fog-azure-rm', '~> 1.1.1', require: false
-+gem 'gitlab-fog-azure-rm', '~> 1.1', '>= 1.1.1', require: false
+-gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: false
++gem 'gitlab-fog-azure-rm', '~> 1.2', require: false
  
  # for Google storage
  gem 'google-api-client', '~> 0.33'
@@ -196,7 +192,7 @@ gitlab Gemfile
 +gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'
 +gem 'gitlab-markup', '~> 1.7','>= 1.7.1'
 +gem 'github-markup', '~> 1.7', require: 'github/markup'
- gem 'commonmarker', '~> 0.21'
+ gem 'commonmarker', '~> 0.23.2'
 -gem 'kramdown', '~> 2.3.1'
 -gem 'RedCloth', '~> 4.3.2'
 -gem 'rdoc', '~> 6.3.2'
@@ -212,8 +208,8 @@ gitlab Gemfile
  gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
  gem 'asciidoctor-plantuml', '~> 0.0.12'
  gem 'asciidoctor-kroki', '~> 0.5.0', require: false
--gem 'rouge', '~> 3.26.0'
-+gem 'rouge', '~> 3.26'
+-gem 'rouge', '~> 3.26.1'
++gem 'rouge', '~> 3.26', '>= 3.26.1'
  gem 'truncato', '~> 0.7.11'
 -gem 'bootstrap_form', '~> 4.2.0'
 -gem 'nokogiri', '~> 1.11.4'
@@ -241,12 +237,12 @@ gitlab Gemfile
  gem 'acts-as-taggable-on', '~> 7.0'
  
  # Background jobs
--gem 'sidekiq', '~> 5.2.7'
-+gem 'sidekiq', '~> 5.2','>= 5.2.7'
+-gem 'sidekiq', '~> 6.2.2'
++gem 'sidekiq', '~> 6.2', '>= 6.2.2'
  gem 'sidekiq-cron', '~> 1.0'
 -gem 'redis-namespace', '~> 1.8.1'
 +gem 'redis-namespace', '~> 1.8','>= 1.8.1'
- gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch'
+ gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
  
  # Cron Parser
 -gem 'fugit', '~> 1.2.1'
@@ -276,8 +272,8 @@ gitlab Gemfile
  gem 'device_detector'
  
  # Redis
--gem 'redis', '~> 4.1.4'
-+gem 'redis', '~> 4.1','>= 4.1.4'
+-gem 'redis', '~> 4.4.0'
++gem 'redis', '~> 4.4'
  gem 'connection_pool', '~> 2.0'
  
  # Redis session store
@@ -411,7 +407,7 @@ gitlab Gemfile
 +  gem 'webmock', '~> 3.9', '>= 3.9.1'
    gem 'rails-controller-testing'
    gem 'concurrent-ruby', '~> 1.1'
-   gem 'test-prof', '~> 0.12.0'
+   gem 'test-prof', '~> 1.0.7'
 @@ -440,7 +440,7 @@
  gem 'email_reply_trimmer', '~> 0.1'
  gem 'html2text'
@@ -436,7 +432,7 @@ gitlab Gemfile
  gem 'spamcheck', '~> 0.1.0'
  
  # Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 14.3.0.pre.rc1'
+-gem 'gitaly', '~> 14.3.0.pre.rc2'
 +gem 'gitaly', '~> 14.3'
  
  # KAS GRPC protocol definitions

debian/patches/Gemfile/0020-remove-development-test.patch

@@ -6,7 +6,7 @@ Bundler will fail when it can't find these locally
  # https://gitlab.com/gitlab-org/gitlab/issues/31747
  gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
  gem 'apollo_upload_server', '~> 2.1'
--gem 'graphql-docs', '~> 1.6', group: [:development, :test]
+-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie'
@@ -26,7 +26,7 @@ Bundler will fail when it can't find these locally
 -  gem 'lefthook', '~> 0.7.0', require: false
 -  gem 'solargraph', '~> 0.43', require: false
 -
--  gem 'letter_opener_web', '~> 1.4.0'
+-  gem 'letter_opener_web', '~> 1.4.1'
 -
 -  # Better errors handler
 -  gem 'better_errors', '~> 2.9.0'

debian/patches/Gemfile/0050-relax-rdoc.patch

@@ -3,7 +3,7 @@ Allow rdoc from ruby 2.5 to match requirement
 --- a/Gemfile
 +++ b/Gemfile
 @@ -156,7 +156,7 @@
- gem 'commonmarker', '~> 0.21'
+ gem 'commonmarker', '~> 0.23.2'
  gem 'kramdown', '~> 2.3','>= 2.3.1'
  gem 'RedCloth', '~> 4.3','>= 4.3.2'
 -gem 'rdoc', '~> 6.3','>= 6.3.2'

debian/patches/Gemfile/0060-remove-gitlab-markup.patch

@@ -10,5 +10,5 @@ maintaining two almost same packages.
  gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'
 -gem 'gitlab-markup', '~> 1.7','>= 1.7.1'
  gem 'github-markup', '~> 1.7', require: 'github/markup'
- gem 'commonmarker', '~> 0.21'
+ gem 'commonmarker', '~> 0.23.2'
  gem 'kramdown', '~> 2.3','>= 2.3.1'

debian/patches/Gemfile/0100-relax-gitlab-sidekiq-fetcher.patch

@@ -1,13 +0,0 @@
-Allow newer version in the archive to satisfy the requirement
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -193,7 +193,7 @@
- gem 'sidekiq', '~> 5.2','>= 5.2.7'
- gem 'sidekiq-cron', '~> 1.0'
- gem 'redis-namespace', '~> 1.8','>= 1.8.1'
--gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch'
-+gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch'
- 
- # Cron Parser
- gem 'fugit', '~> 1.2','>= 1.2.1'

debian/patches/Gemfile/0110-relax-sidekiq.patch

@@ -1,13 +0,0 @@
-ruby-sidekiq 6 is in unstable
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -190,7 +190,7 @@
- gem 'acts-as-taggable-on', '~> 7.0'
- 
- # Background jobs
--gem 'sidekiq', '~> 5.2','>= 5.2.7'
-+gem 'sidekiq', '< 7.0','>= 5.2.7'
- gem 'sidekiq-cron', '~> 1.0'
- gem 'redis-namespace', '~> 1.8','>= 1.8.1'
- gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch'

debian/patches/Gemfile/0140-remove-guard-rspec.patch

@@ -2,7 +2,7 @@
 +++ b/Gemfile
 @@ -383,7 +383,6 @@
    gem 'concurrent-ruby', '~> 1.1'
-   gem 'test-prof', '~> 0.12.0'
+   gem 'test-prof', '~> 1.0.7'
    gem 'rspec_junit_formatter'
 -  gem 'guard-rspec'
  

debian/patches/series

@@ -7,8 +7,6 @@ Gemfile/0060-remove-gitlab-markup.patch
 Gemfile/0070-embed-elasticsearch-model.patch
 Gemfile/0080-embed-elasticsearch-rails.patch
 Gemfile/0090-remove-ee-only-gems.patch
-Gemfile/0100-relax-gitlab-sidekiq-fetcher.patch
-Gemfile/0110-relax-sidekiq.patch
 Gemfile/0120-relax-capybara.patch
 Gemfile/0130-remove-capybara-screenshot.patch
 Gemfile/0140-remove-guard-rspec.patch
@@ -27,4 +25,3 @@ Gemfile/0160-relax-rexml.patch
 0750-fix-relative-paths.patch
 0770-remove-capybara-screenshot-rspec.patch
 0800-search-binaries-in-path.patch
-0810-postgresql-cte-rails-6-1-4.patch