summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2015-12-07 22:41:18 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2015-12-07 22:41:18 -0200
commitf7aafd8fc8e1dd3a414e3827c42087b364ebd5a0 (patch)
tree5b13c5d00dbc7590eec668b91b74fbc21b044f9f /Gemfile
parent7d836a0c0ae2869a6b915234d347d15e25a511fe (diff)
parente02940e32941cc253f713ef3fe0aac896c9342ac (diff)
downloadgitlab-ce-f7aafd8fc8e1dd3a414e3827c42087b364ebd5a0.tar.gz
Merge branch 'master' into fix-merge-request-that-removes-submodulefix-merge-request-that-removes-submodule
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'