From 2a7dc528d222b563325bba477eed6eb3341c41ae Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 8 Mar 2023 23:06:13 +0530 Subject: [PATCH 1/2] Relax dependency on ruby-net-ldap --- debian/patches/Gemfile/0230-relax-net-ldap.patch | 11 +++++++++++ debian/patches/series | 1 + 2 files changed, 12 insertions(+) create mode 100644 debian/patches/Gemfile/0230-relax-net-ldap.patch diff --git a/debian/patches/Gemfile/0230-relax-net-ldap.patch b/debian/patches/Gemfile/0230-relax-net-ldap.patch new file mode 100644 index 0000000000..d1a2a9a737 --- /dev/null +++ b/debian/patches/Gemfile/0230-relax-net-ldap.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -115,7 +115,7 @@ + # 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.2', require: 'omniauth-ldap' +-gem 'net-ldap', '~> 0.16.3' ++gem 'net-ldap', '~> 0.17.0' + + # API + gem 'grape', '~> 1.5','>= 1.5.2' diff --git a/debian/patches/series b/debian/patches/series index 8936c3455f..47cdc30703 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,6 +13,7 @@ Gemfile/0190-relax-rdoc.patch Gemfile/0200-add-gitlab-dangerfiles.patch Gemfile/0210-comment-out-openssl.patch Gemfile/0220-relax-oj-in-ipynbdiff.patch +Gemfile/0230-relax-net-ldap.patch nodejs/0010-set-webpack-root.patch nodejs/0020-remove-dev-dependencies.patch nodejs/0030-use-yarnpkg.patch From c0f328e75907e7f5fa496a91207561b03165ad85 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 8 Mar 2023 23:07:05 +0530 Subject: [PATCH 2/2] Upload to experimental --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a34485a4ca..bf7dfe3059 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gitlab (15.7.8+ds1-7) experimental; urgency=medium + + * Relax dependency on ruby-net-ldap + + -- Pirate Praveen Wed, 08 Mar 2023 23:06:57 +0530 + gitlab (15.7.8+ds1-6) experimental; urgency=medium * Start a sidekiq cluster instead of standalone (upstream now only supports