Merge tag 'debian/13.9.4+ds1-3' into buster-fasttrack

gitlab Debian release 13.9.4+ds1-3

debian/changelog

@@ -1,3 +1,11 @@
+gitlab (13.9.4+ds1-3) experimental; urgency=medium
+
+  * Relax dependency on gitlab-labkit (for matching with gitaly requirement)
+  * Update minimum versions of ruby-rugged and ruby-licensee again
+   (ruby-rugged/libgit2 1.x now work after ruby-licensee was fixed)
+
+ -- Pirate Praveen <praveen@debian.org>  Sat, 27 Mar 2021 16:09:29 +0530
+
 gitlab (13.9.4+ds1-2~fto10+2) buster-fasttrack; urgency=medium
 
   * Switch back to ruby-rugged 0.28 in Gemfile

debian/control

@@ -47,7 +47,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-default-value-for (>= 3.4~),
 #ruby-mysql2 | ruby-pg,
  ruby-pg (>= 1.1~),
- ruby-rugged (>= 0.28~),
+ ruby-rugged (>= 1.0~),
  ruby-grape-path-helpers (>= 1.6.1~),
  ruby-faraday (>= 1.0~),
  ruby-marginalia (>= 1.10~),
@@ -237,7 +237,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # Sanitizes SVG input
  ruby-loofah (>= 2.2~),
 # Working with license
- ruby-licensee (>= 8.9~),
+ ruby-licensee (>= 9.14.1~),
 # Protect against bruteforcing
  ruby-rack-attack (>= 6.3~),
 # Ace editor
@@ -277,7 +277,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 #
  ruby-premailer-rails (>= 1.10.3-2~),
 # LabKit: Tracing and Correlation
- ruby-gitlab-labkit (>= 0.14~),
+ ruby-gitlab-labkit (>= 0.15~),
 # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
  ruby-thrift (>= 0.14~),

debian/patches/0499-91-relax-gitlab-labkit.patch

@@ -0,0 +1,13 @@
+gitaly needs gitlab-labkit ~> 0.15.0
+
+--- a/Gemfile
++++ b/Gemfile
+@@ -297,7 +297,7 @@
+ gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
+ 
+ # LabKit: Tracing and Correlation
+-gem 'gitlab-labkit', '~> 0.14.0'
++gem 'gitlab-labkit', '~> 0.15.0'
+ # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
+ # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
+ gem 'thrift', '>= 0.14.0'

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

@@ -1,22 +0,0 @@
-rugged 1.x breaks gitlab
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -17,7 +17,7 @@
- # Supported DBs
- gem 'pg', '~> 1.1'
- 
--gem 'rugged', '~> 1.0', '>= 1.0.1'
-+gem 'rugged', '~> 0.28'
- gem 'grape-path-helpers', '~> 1.6', '>= 1.6.1'
- 
- gem 'faraday', '~> 1.0'
-@@ -258,7 +258,7 @@
- gem 'loofah', '~> 2.2'
- 
- # Working with license
--gem 'licensee', '~> 9.14.1'
-+gem 'licensee', '~> 8.9'
- 
- # Detect and convert string character encoding
- gem 'charlock_holmes', '~> 0.7.7'

debian/patches/series

@@ -17,7 +17,7 @@
 0499-40-relax-rouge.patch
 0499-70-relax-graphlient.patch
 0499-90-relax-webrick.patch
-0499-91-relax-rugged.patch
+0499-91-relax-gitlab-labkit.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
 0520-add-system-lib-path-for-webpack.patch