diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-30 05:17:29 +0000 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-12-01 12:15:03 -0300 |
| commit | 212cd962a404e8f5c6c6e77228708d6d7d984583 (patch) | |
| tree | f1503789cad2ac36839f5a90aafcc97ddd39883e | |
| parent | b9a9e37bb094eaafa0b1f131b8f8899ae92b5c80 (diff) | |
| download | gitlab-ce-212cd962a404e8f5c6c6e77228708d6d7d984583.tar.gz | |
Merge branch 'sh-update-sidekiq-cron' into 'master'
Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1
The "Enqueue Now" button would not work in the admin panel due to changes in the Web extension interface: https://github.com/ondrejbartas/sidekiq-cron/commit/88ada926132d4658e3fd370c9f44899b6c88ccaf
Closes #24376
See merge request !7815
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 9 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-update-sidekiq-cron.yml | 4 |
3 files changed, 10 insertions, 5 deletions
@@ -135,7 +135,7 @@ gem 'acts-as-taggable-on', '~> 4.0' # Background jobs gem 'sidekiq', '~> 4.2' -gem 'sidekiq-cron', '~> 0.4.0' +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 cf2ebaa00d6..9a49b023c0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -640,7 +640,8 @@ GEM rubyntlm (0.5.2) rubypants (0.2.0) rubyzip (1.2.0) - rufus-scheduler (3.1.10) + rufus-scheduler (3.3.0) + tzinfo rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) @@ -676,10 +677,10 @@ GEM connection_pool (~> 2.2, >= 2.2.0) rack-protection (~> 1.5) redis (~> 3.2, >= 3.2.1) - sidekiq-cron (0.4.0) + sidekiq-cron (0.4.4) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) + sidekiq (>= 4.2.1) sidekiq-limit_fetch (3.4.0) sidekiq (>= 4) simplecov (0.12.0) @@ -956,7 +957,7 @@ DEPENDENCIES sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) sidekiq (~> 4.2) - sidekiq-cron (~> 0.4.0) + sidekiq-cron (~> 0.4.4) sidekiq-limit_fetch (~> 3.4) simplecov (= 0.12.0) slack-notifier (~> 1.2.0) diff --git a/changelogs/unreleased/sh-update-sidekiq-cron.yml b/changelogs/unreleased/sh-update-sidekiq-cron.yml new file mode 100644 index 00000000000..d79ba817a18 --- /dev/null +++ b/changelogs/unreleased/sh-update-sidekiq-cron.yml @@ -0,0 +1,4 @@ +--- +title: Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1 +merge_request: +author: |