Upload to buster-fasttrack

gitlab Debian release 13.12.9+ds1-3

debian/control

@@ -100,7 +100,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # Authorization
  ruby-declarative-policy,
 # Authentication libraries
- ruby-devise (>= 4.7.1~),
+ ruby-devise (>= 4.7.2~),
  ruby-bcrypt (>= 3.1.14~),
  ruby-doorkeeper (>= 5.5~),
  ruby-doorkeeper-openid-connect (>= 1.7.5~),
@@ -271,7 +271,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-flowdock (>= 0.7~),
    ruby-posix-spawn (>= 0.3.13~),
 # Slack integration
- ruby-slack-messenger (>= 2.3.3~),
+ ruby-slack-messenger (>= 2.3.4~),
 # Hangouts Chat integration
  ruby-hangouts-chat (>= 0.0.5),
 # Asana integration
@@ -279,7 +279,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # FogBugz integration
  ruby-fogbugz (>= 0.2.1-3~),
 # Kubernetes integration
- ruby-kubeclient (>= 4.6~),
+ ruby-kubeclient (>= 4.9.1~),
    ruby-recursive-open-struct (>= 1.1.1~),
    ruby-http (>= 4.4~),
 # Sanitize user input
@@ -461,7 +461,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  node-marked (>= 0.3~),
  node-mermaid (>= 8.9.2~),
  node-minimatch,
- node-miragejs,
+# backporting this will take some time
+# node-miragejs,
  node-mousetrap,
  node-pdfjs-dist,
 # Include node-pikaday only after @gitlab/ui is accepted
@@ -474,15 +475,16 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  node-raw-loader (>= 4.0~),
  node-style-loader (>= 1.0~),
  node-three-orbit-controls (>= 82.1.0-3~),
- node-three-stl-loader (>= 1.0.4~),
+ node-three-stl-loader (>= 1.0.6-3~),
  node-timeago.js (>= 4.0~),
  node-underscore (>= 1.9~),
  node-url-loader (>= 3.0~),
  node-uuid (>= 8.1~),
- node-vue (>= 2.6.10~),
+ node-vue (>= 2.6.12~),
  node-vue-resource (>= 1.5.1~),
 # Blocked by #927254
 # node-vue-router,
+ node-vue-template-compiler (>= 2.6.12~),
  webpack (>= 4.43~),
  node-webpack-stats-plugin,
  node-worker-loader (>= 2.0~),

debian/gitlab.examples

@@ -0,0 +1 @@
+doc/ci/examples/*

debian/gitlab.links

@@ -2,6 +2,9 @@ var/lib/gitlab/public usr/share/gitlab/public
 var/lib/gitlab/shared usr/share/gitlab/shared
 var/lib/gitlab/db usr/share/gitlab/db
 var/lib/gitlab/node_modules usr/share/gitlab/node_modules
+# This is required for webpack to resolve direct dependencies mentioned
+# in config/webpack.config.js, because it is a symbolic link to /etc/gitlab
+var/lib/gitlab/node_modules etc/gitlab/node_modules
 var/lib/gitlab/package.json usr/share/gitlab/package.json
 var/lib/gitlab/yarn-error.log usr/share/gitlab/yarn-error.log
 var/lib/gitlab/yarn.lock usr/share/gitlab/yarn.lock

debian/patches/0499-50-relax-rack.patch

@@ -0,0 +1,13 @@
+3 tests are failing when updating rack to 2.1.4, but CVE patches are backported
+
+--- a/Gemfile
++++ b/Gemfile
+@@ -167,7 +167,7 @@
+ gem 'diff_match_patch', '~> 0.1.0'
+ 
+ # Application server
+-gem 'rack', '~> 2.0', '>= 2.1.4'
++gem 'rack', '~> 2.1'
+ # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
+ gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
+ 

debian/rake-tasks.sh

@@ -38,7 +38,7 @@ chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
 echo "Installing node modules..."
 cd /var/lib/gitlab
 runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.cache'
-runuser -u ${gitlab_user} -- sh -c 'yarnpkg set version berry'
+runuser -u ${gitlab_user} -- sh -c 'yarnpkg set version 2.4.2'
 runuser -u ${gitlab_user} -- sh -c 'if ! grep nodeLinker .yarnrc.yml >/dev/null; then echo "nodeLinker: \"node-modules\"" >>.yarnrc.yml; fi'
 runuser -u ${gitlab_user} -- sh -c 'yarnpkg install'
 # Remove write permissions of .yarn-metadata.json files
@@ -55,4 +55,4 @@ runuser -u ${gitlab_user} -- sh -c '/usr/bin/bundle exec rake tmp:cache:clear as
 echo "Webpacking..."
 # Workaround for webpack crashing with nodejs 10 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=956211
 # Build assets in production mode - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=956508
-runuser -u ${gitlab_user} -- sh -c 'NODE_ENV="production" NODE_PATH="node_modules" NODE_OPTIONS="--max-old-space-size=4096" webpack --config config/webpack.config.js'
+runuser -u ${gitlab_user} -- sh -c 'NODE_ENV="production" NODE_OPTIONS="--max-old-space-size=4096" webpack --config config/webpack.config.js'