From 6f166564ac1e32825fd44a4ca148e1c694306787 Mon Sep 17 00:00:00 2001
From: icyleaf <icyleaf.cn@gmail.com>
Date: Thu, 2 Apr 2020 19:24:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=9E=E6=BB=9A=20sidekiq=20=E5=88=B0?=
 =?UTF-8?q?=206.0.5=20=E8=A7=A3=E5=86=B3=20webpacker=20=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BC=9A=E8=BF=9E=E6=8E=A5=20redis=20(mperha?=
 =?UTF-8?q?m/sidekiq#4502)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 637568fa4..c4f5454ec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,7 @@ gem 'rqrcode'
 
 # 异步队列
 gem 'activejob-status'
-gem 'sidekiq', '<= 7'
+gem 'sidekiq', '6.0.5' # 6.0.6 有 bug：https://github.com/mperham/sidekiq/pull/4502
 gem 'sidekiq-cron', '~> 1.0'
 
 # Assets
diff --git a/Gemfile.lock b/Gemfile.lock
index a948c7340..87fcc126f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -378,7 +378,7 @@ GEM
       faraday (>= 1.0)
     settingslogic (2.0.9)
     shellany (0.0.1)
-    sidekiq (6.0.6)
+    sidekiq (6.0.5)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       rack-protection (>= 2.0.0)
@@ -500,7 +500,7 @@ DEPENDENCIES
   ruby-debug-ide
   sentry-raven
   settingslogic
-  sidekiq (<= 7)
+  sidekiq (= 6.0.5)
   sidekiq-cron (~> 1.0)
   simple_form (~> 5.0)
   slim-rails (~> 3.2.0)