diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-01 20:55:13 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-01 20:55:13 +0000 |
| commit | 0ccdc631e6f45c0fd327631decb47f80d781302e (patch) | |
| tree | 97277b85747c206493c5a423c3c7a6c7e8d3d1fe /lib/api/branches.rb | |
| parent | 62730e5431b03feca1d6101acb791ccfe8bed785 (diff) | |
| parent | 44544b34819ae65d0f500fce7259f74a1ec1bde3 (diff) | |
| download | gitlab-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 'lib/api/branches.rb')
0 files changed, 0 insertions, 0 deletions