summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-07 18:53:59 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-07 18:53:59 +0000
commit1da71fa9ed4513d966a5824382fc87be4f0fb307 (patch)
tree2645a269fde93fbb5665d6683aaff93e4515edcd /Gemfile
parent24c7eafb295a292ed5eb166688d638f7d3278261 (diff)
parent496870ddec632ae13cff8b5e8f6ca0bff0fa3ec7 (diff)
downloadgitlab-ce-1da71fa9ed4513d966a5824382fc87be4f0fb307.tar.gz
Merge branch 'feature/sidekiq-cron' into 'master'
Migrate from Sidetiq to Sidekiq-cron Migrate from Sidetiq to Sidekiq-cron Updated Sidekiq to 3.5.x This will solve #2355 See merge request !1982
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 860e6bee47d..25e30e0211a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -120,8 +120,8 @@ gem 'acts-as-taggable-on', '~> 3.4'
# Background jobs
gem 'sinatra', '~> 1.4.4', require: nil
-gem 'sidekiq', '3.3.0'
-gem 'sidetiq', '~> 0.6.3'
+gem 'sidekiq', '~> 3.5.0'
+gem 'sidekiq-cron', '~> 0.3.0'
# HTTP requests
gem "httparty", '~> 0.13.3'