summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-22 13:59:15 -0700
committerStan Hu <stanhu@gmail.com>2019-04-22 15:54:29 -0700
commit120954dab339fd54ea43eff09d3c47192565f0e9 (patch)
tree7def70a5bb110353bd2dc2424376a32bfe77182a
parent84a1e37f4a889c6b7558f101dc0ecf2932d0a0c6 (diff)
downloadgitlab-ce-sh-bump-sidekiq-5.2.6.tar.gz
Bump Sidekiq to 5.2.7sh-bump-sidekiq-5.2.6
Fixes minor bugs (https://github.com/mperham/sidekiq/blob/master/Changes.md#526) and keeps version used with gitlab-monitor consistent.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index eaaf8125009..be7b5961ca4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -158,7 +158,7 @@ gem 'state_machines-activerecord', '~> 0.5.1'
gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
-gem 'sidekiq', '~> 5.2.1'
+gem 'sidekiq', '~> 5.2.7'
gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.6.0'
gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
diff --git a/Gemfile.lock b/Gemfile.lock
index ba4418cd8b3..704727e96f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -846,7 +846,7 @@ GEM
rack
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
- sidekiq (5.2.5)
+ sidekiq (5.2.7)
connection_pool (~> 2.2, >= 2.2.2)
rack (>= 1.5.0)
rack-protection (>= 1.5.0)
@@ -1183,7 +1183,7 @@ DEPENDENCIES
settingslogic (~> 2.0.9)
sham_rack (~> 1.3.6)
shoulda-matchers (~> 3.1.2)
- sidekiq (~> 5.2.1)
+ sidekiq (~> 5.2.7)
sidekiq-cron (~> 1.0)
simple_po_parser (~> 1.1.2)
simplecov (~> 0.14.0)