diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-04-23 08:42:58 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-04-23 08:42:58 +0000 |
| commit | 30940ccd242dcd05d7205f75af2c16e8dc4ae769 (patch) | |
| tree | db9772d4caa1da4378bb21ae25374074ef7ce0cd | |
| parent | f34582fe740f6a9e3a97c1d59ff921f2f8dfa926 (diff) | |
| parent | 120954dab339fd54ea43eff09d3c47192565f0e9 (diff) | |
| download | gitlab-ce-30940ccd242dcd05d7205f75af2c16e8dc4ae769.tar.gz | |
Merge branch 'sh-bump-sidekiq-5.2.6' into 'master'
Bump Sidekiq to 5.2.7
See merge request gitlab-org/gitlab-ce!27512
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 d214892eed7..faf5af5c7e7 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) |