summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-11-30 05:17:29 +0000
committerRobert Speicher <robert@gitlab.com>2016-11-30 05:17:29 +0000
commitfb17ce1f2f25dde8988f3b2d3abf8d7fc4154c06 (patch)
treeefe9b2b53d4f29c80c1b2a3499d6d98c5287b608
parent4a3a4131616d7041d28e1ef9316abe3772c45bad (diff)
parent49491e63b818b757bd05c9b1d0b447f1baf30db0 (diff)
downloadgitlab-ce-fb17ce1f2f25dde8988f3b2d3abf8d7fc4154c06.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--Gemfile2
-rw-r--r--Gemfile.lock9
-rw-r--r--changelogs/unreleased/sh-update-sidekiq-cron.yml4
3 files changed, 10 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 1d686199557..350ecd0ca02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -133,7 +133,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 bf9702b2562..40aa91423c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -614,7 +614,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)
@@ -650,10 +651,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)
@@ -925,7 +926,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: