From 24560d79fcf709fb871957e775dd02ad5a19eb39 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Mon, 9 Oct 2017 20:49:55 +0900
Subject: Use released `sidekiq` instead of master version

The sidekiq 5.0.5 includes redis-rb 4.0 support.
Ref: https://github.com/mperham/sidekiq/blob/90db3b84208cbb73a50d1a77a1dea97d3490ce70/Changes.md#505
---
 Gemfile      |  2 +-
 Gemfile.lock | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index aaf55f18c9..1ef6629945 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,7 @@ gem "bootsnap", ">= 1.1.0", require: false
 group :job do
   gem "resque", require: false
   gem "resque-scheduler", github: "jeremy/resque-scheduler", branch: "redis-rb-4.0", require: false
-  gem "sidekiq", github: "mperham/sidekiq", require: false
+  gem "sidekiq", require: false
   gem "sucker_punch", require: false
   gem "delayed_job", require: false
   gem "queue_classic", github: "QueueClassic/queue_classic", branch: "master", require: false, platforms: :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index e3b30b84c2..9c3a7e3c82 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,16 +34,6 @@ GIT
       event_emitter
       websocket
 
-GIT
-  remote: https://github.com/mperham/sidekiq.git
-  revision: 6332b9f8a316cf1000246701e40e108d16fed6d4
-  specs:
-    sidekiq (5.0.5)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.4, < 5)
-
 GIT
   remote: https://github.com/rails/arel.git
   revision: 42510bf71472e2e35d9becb546edd05562672344
@@ -424,6 +414,11 @@ GEM
     sequel (4.49.0)
     serverengine (1.5.11)
       sigdump (~> 0.2.2)
+    sidekiq (5.0.5)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 3.3.4, < 5)
     sigdump (0.2.4)
     signet (0.7.3)
       addressable (~> 2.3)
@@ -544,7 +539,7 @@ DEPENDENCIES
   sass-rails!
   sdoc!
   sequel
-  sidekiq!
+  sidekiq
   sneakers
   sprockets-export
   sqlite3 (~> 1.3.6)
-- 
cgit v1.2.3