diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-10-10 00:26:33 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 00:26:33 +0900 |
| commit | 524ba0b6d8ffcf3fdd20002f702f8c436bdb5dbf (patch) | |
| tree | a9bfee4f7dd75f353c9591429376491f4abff82f | |
| parent | c5ab6e51a7b9ee05a2d262a72c7130b9c1d1b0ce (diff) | |
| parent | 24560d79fcf709fb871957e775dd02ad5a19eb39 (diff) | |
| download | rails-524ba0b6d8ffcf3fdd20002f702f8c436bdb5dbf.tar.gz rails-524ba0b6d8ffcf3fdd20002f702f8c436bdb5dbf.tar.bz2 rails-524ba0b6d8ffcf3fdd20002f702f8c436bdb5dbf.zip | |
Merge pull request #30843 from y-yagi/use_released_gem
Use released `sidekiq` instead of master version
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 17 |
2 files changed, 7 insertions, 12 deletions
@@ -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 @@ -35,16 +35,6 @@ GIT 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 specs: @@ -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) |