Upload to experimental

debian/changelog

@@ -1,3 +1,16 @@
+gitlab (13.6.7-4) experimental; urgency=medium
+
+  * Add resolutions: typescript 4.1.5 in package.json (Closes: #983480)
+
+ -- Pirate Praveen <praveen@debian.org>  Thu, 25 Feb 2021 12:45:57 +0530
+
+gitlab (13.6.7-3) experimental; urgency=medium
+
+  * Add --quiet to gitlab-sidekiq.service running bundle install --local
+  * Switch back to ruby-rugged 0.28 (use snapshot.debian.org)
+
+ -- Pirate Praveen <praveen@debian.org>  Wed, 24 Feb 2021 21:46:34 +0530
+
 gitlab (13.6.7-2) experimental; urgency=medium
 
   * Change dependency on ruby to ruby2.7

debian/control

@@ -48,7 +48,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-default-value-for (>= 3.3~),
 #ruby-mysql2 | ruby-pg,
  ruby-pg (>= 1.1~),
- ruby-rugged (>= 1.1~),
+ ruby-rugged (>= 0.28~),
  ruby-grape-path-helpers (>= 1.3~),
  ruby-faraday (>= 1.0~),
  ruby-marginalia (>= 1.9~),
@@ -234,7 +234,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # Sanitizes SVG input
  ruby-loofah (>= 2.2~),
 # Working with license
- ruby-licensee (>= 9.14~),
+ ruby-licensee (>= 8.9~),
 # Protect against bruteforcing
  ruby-rack-attack (>= 6.3~),
 # Ace editor

debian/gitlab.gitlab-sidekiq.service

@@ -13,7 +13,7 @@ WorkingDirectory=/usr/share/gitlab
 EnvironmentFile=/etc/gitlab/gitlab-debian.conf
 SyslogIdentifier=gitlab-sidekiq
 ExecStartPre=truncate -s 0 Gemfile.lock
-ExecStartPre=/usr/bin/bundle install --local
+ExecStartPre=/usr/bin/bundle install --local --quiet
 ExecStart=/usr/bin/bundle exec sidekiq \
     -C /etc/gitlab/sidekiq_queues.yml \
     -e $RAILS_ENV

debian/patches/0499-60-relax-rugged.patch

@@ -1,20 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -18,7 +18,7 @@
- # Supported DBs
- gem 'pg', '~> 1.1'
- 
--gem 'rugged', '~> 0.28'
-+gem 'rugged', '~> 1.1'
- gem 'grape-path-helpers', '~> 1.5'
- 
- gem 'faraday', '~> 1.0'
-@@ -260,7 +260,7 @@
- gem 'loofah', '~> 2.2'
- 
- # Working with license
--gem 'licensee', '~> 8.9'
-+gem 'licensee', '~> 9.14'
- 
- # Detect and convert string character encoding
- gem 'charlock_holmes', '~> 0.7.7'

debian/patches/0530-typescript-yarnpkg-comapt.patch

@@ -0,0 +1,16 @@
+typescript 4.2 breaks yarn 2 pnp compat plugin
+
+Bug: https://github.com/yarnpkg/berry/pull/2440
+
+--- a/package.json
++++ b/package.json
+@@ -167,7 +167,8 @@
+   },
+   "resolutions": {
+     "chokidar": "^3.4.0",
+-    "monaco-editor": "0.20.0"
++    "monaco-editor": "0.20.0",
++    "typescript": "4.1.5"
+   },
+   "engines": {
+     "node": ">=10.13.0",

debian/patches/series

@@ -15,11 +15,11 @@
 0499-20-remove-capybara-screenshot.patch
 0499-30-remove-guard-rspec.patch
 0499-40-relax-rouge.patch
-0499-60-relax-rugged.patch
 0499-70-relax-graphlient.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
 0520-add-system-lib-path-for-webpack.patch
+0530-typescript-yarnpkg-comapt.patch
 0610-source-init-functions.patch
 0620-pid-log-paths.patch
 0630-fix-mail-room-path.patch