From ed25957479edda5494aa74c8251ea7f7c8f25e95 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Tue, 11 Aug 2020 18:25:58 +0530
Subject: [PATCH] Relax dependency on sidekiq gem in Gemfile to allow 6.x
 version

---
 debian/patches/0486-relax-sidekiq.patch | 13 +++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 debian/patches/0486-relax-sidekiq.patch

diff --git a/debian/patches/0486-relax-sidekiq.patch b/debian/patches/0486-relax-sidekiq.patch
new file mode 100644
index 0000000000..3f20873a94
--- /dev/null
+++ b/debian/patches/0486-relax-sidekiq.patch
@@ -0,0 +1,13 @@
+ruby-sidekiq 6 is in unstable
+
+--- a/Gemfile
++++ b/Gemfile
+@@ -176,7 +176,7 @@
+ gem 'acts-as-taggable-on', '~> 6.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.6'
+ gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch'
diff --git a/debian/patches/series b/debian/patches/series
index aaef394cbc..07a0fd1bc9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,7 @@
 0482-remove-ee-only-gems.patch
 0484-relax-grape-entity.patch
 0485-relax-gitlab-sidekiq-fetcher.patch
+0486-relax-sidekiq.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
 0520-add-system-lib-path-for-webpack.patch