diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-07-01 08:02:04 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-07-01 08:02:04 -0600 |
| commit | 44544b34819ae65d0f500fce7259f74a1ec1bde3 (patch) | |
| tree | 9135ab13bb2f2a2ea685704935235937b0060e21 /Gemfile.lock | |
| parent | c578fb064c6a90cbaf60959d7706c0bcc34d87f5 (diff) | |
| download | gitlab-ce-44544b34819ae65d0f500fce7259f74a1ec1bde3.tar.gz | |
Upgrade Sidekiq from 4.1.2 to 4.1.4.upgrade-sidekiq
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
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f99b373dbbd..b8f34d88ae2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -662,10 +662,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) @@ -676,8 +677,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) |