diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-12 17:46:26 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-12 17:46:26 +0000 |
| commit | d6fb30eb4f0fb42f1f1c23ce63e33e4d7422ef2e (patch) | |
| tree | 97ec01e9f6f217157e216fc7e61e0d22085d796f | |
| parent | 407adb9e9529d4aa769dbd1fbb3932684e036c3a (diff) | |
| parent | e117cb3a1965c15d3d5617addb695f337dcf069f (diff) | |
| download | gitlab-ce-d6fb30eb4f0fb42f1f1c23ce63e33e4d7422ef2e.tar.gz | |
Merge branch 'cs-update-sidekiq-427' into 'master'
Update Sidekiq from 4.2.1 to 4.2.7.
Includes various bug fixes, mostly for Rails 5.
Changelog: https://github.com/mperham/sidekiq/blob/fc168fe393bee3ad1fcbb52cff2d84af86c38cc4/Changes.md
See merge request !8032
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -132,7 +132,7 @@ gem 'after_commit_queue', '~> 1.3.0' gem 'acts-as-taggable-on', '~> 4.0' # Background jobs -gem 'sidekiq', '~> 4.2' +gem 'sidekiq', '~> 4.2.7' gem 'sidekiq-cron', '~> 0.4.4' gem 'redis-namespace', '~> 1.5.2' gem 'sidekiq-limit_fetch', '~> 3.4' diff --git a/Gemfile.lock b/Gemfile.lock index c464ff70587..3de1a7cbf26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,7 +126,7 @@ GEM coffee-script-source (1.10.0) colorize (0.7.7) concurrent-ruby (1.0.2) - connection_pool (2.2.0) + connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) @@ -648,10 +648,10 @@ GEM rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.2.1) + sidekiq (4.2.7) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) - rack-protection (~> 1.5) + rack-protection (>= 1.5.0) redis (~> 3.2, >= 3.2.1) sidekiq-cron (0.4.4) redis-namespace (>= 1.5.2) @@ -928,7 +928,7 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.2) + sidekiq (~> 4.2.7) sidekiq-cron (~> 0.4.4) sidekiq-limit_fetch (~> 3.4) simplecov (= 0.12.0) |