summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-09-14 11:02:54 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-09-15 15:51:30 -0600
commit6026c5616741a9e9ee602be36ff84d147b80afce (patch)
tree96c78e7384b114b06ed400812ce7ea9710442f63 /Gemfile
parentd2370422c5d5f2b011b8c2349dab964e4088284b (diff)
downloadgitlab-ce-6026c5616741a9e9ee602be36ff84d147b80afce.tar.gz
Upgrade Sidekiq from 4.1.4 to 4.2.1, remove dependency on Sinatra
Changelog: https://github.com/mperham/sidekiq/blob/921e939f995fbb5238975d4121d728b95be99ab5/Changes.md#421 Sinatra is no longer required and sidekiq uses a vanilla Rack app for its Web UI now.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 70d8495325f..dd759c048a1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,8 +135,7 @@ gem 'after_commit_queue', '~> 1.3.0'
gem 'acts-as-taggable-on', '~> 3.4'
# Background jobs
-gem 'sinatra', '~> 1.4.4', require: false
-gem 'sidekiq', '~> 4.0'
+gem 'sidekiq', '~> 4.2'
gem 'sidekiq-cron', '~> 0.4.0'
gem 'redis-namespace', '~> 1.5.2'