From a1365eff0a873bb41f43fe88b60d3246493007da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Lled=C3=B3?= <jlledo@redhat.com>
Date: Thu, 22 Aug 2024 17:59:35 +0200
Subject: [PATCH] Upgrade `sidekiq-batch` to 0.8.0 (#3870)

---
 Gemfile      |  5 +----
 Gemfile.lock | 12 +++---------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2fae17a4c0..3711240101 100644
--- a/Gemfile
+++ b/Gemfile
@@ -55,10 +55,7 @@ gem 'statsd-ruby', require: false
 
 # Sidekiq
 gem 'sidekiq', '~> 7', require: %w[sidekiq sidekiq/web]
-# Use a forked sidekiq-batch with support for Sidekiq 7
-# The next upstream version will add support Sidekiq 7 as well
-# Remove this fork when they release the new version
-gem 'sidekiq-batch', github: '3scale/sidekiq-batch', branch: 'redis-client'
+gem 'sidekiq-batch', '~> 0.2.0'
 gem 'sidekiq-cron', require: %w[sidekiq/cron sidekiq/cron/web]
 gem 'sidekiq-throttled', '~> 1.4.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0225f046a6..9f353f5426 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,14 +28,6 @@ GIT
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
 
-GIT
-  remote: https://github.com/3scale/sidekiq-batch.git
-  revision: f1c56d0b8445fd3eb337614aedba1752aa19938e
-  branch: redis-client
-  specs:
-    sidekiq-batch (0.1.9)
-      sidekiq (~> 7)
-
 GIT
   remote: https://github.com/3scale/swagger-ui_rails.git
   revision: f88bb8bed4fdb57fcf5be6425f3fc10c638788d1
@@ -792,6 +784,8 @@ GEM
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
       redis-client (>= 0.19.0)
+    sidekiq-batch (0.2.0)
+      sidekiq (>= 7, < 8)
     sidekiq-cron (1.9.1)
       fugit (~> 1.8)
       sidekiq (>= 4.2.1)
@@ -1074,7 +1068,7 @@ DEPENDENCIES
   selenium-webdriver (~> 3.142)
   shoulda (~> 4.0)
   sidekiq (~> 7)
-  sidekiq-batch!
+  sidekiq-batch (~> 0.2.0)
   sidekiq-cron
   sidekiq-throttled (~> 1.4.0)
   simplecov (~> 0.21.2)