summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-01 20:55:13 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-01 20:55:13 +0000
commit0ccdc631e6f45c0fd327631decb47f80d781302e (patch)
tree97277b85747c206493c5a423c3c7a6c7e8d3d1fe /Gemfile.lock
parent62730e5431b03feca1d6101acb791ccfe8bed785 (diff)
parent44544b34819ae65d0f500fce7259f74a1ec1bde3 (diff)
downloadgitlab-ce-0ccdc631e6f45c0fd327631decb47f80d781302e.tar.gz
Merge branch 'upgrade-sidekiq' into 'master'
Upgrade Sidekiq from 4.1.2 to 4.1.4. Adds a dependency on Sinatra and allows Sinatra 2 for eventual support of Rack 2. Changelog: https://github.com/mperham/sidekiq/blob/master/Changes.md#414 Working toward #14286. See merge request !5044
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock7
1 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index df2f18cfbe5..45cb327168c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -660,10 +660,11 @@ GEM
rack
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
- sidekiq (4.1.2)
+ sidekiq (4.1.4)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
redis (~> 3.2, >= 3.2.1)
+ sinatra (>= 1.4.7)
sidekiq-cron (0.4.0)
redis-namespace (>= 1.5.2)
rufus-scheduler (>= 2.0.24)
@@ -674,8 +675,8 @@ GEM
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
- sinatra (1.4.6)
- rack (~> 1.4)
+ sinatra (1.4.7)
+ rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
six (0.2.0)