diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-09-21 08:14:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-09-21 08:14:03 +0000 |
| commit | 49405ac746a8aa2a4854d14e4a8cb6539535b1a5 (patch) | |
| tree | 4c0ac5adc03816610fefc60391febe601874ec5d /doc/intro | |
| parent | 5416ab8a0df000bfa9f853840d44d992a975db83 (diff) | |
| parent | 6026c5616741a9e9ee602be36ff84d147b80afce (diff) | |
| download | gitlab-ce-49405ac746a8aa2a4854d14e4a8cb6539535b1a5.tar.gz | |
Merge branch 'cs-upgrade-sidekiq' into 'master'
Upgrade Sidekiq to 4.2.1, remove dependency on Sinatra
This updates Sidekiq to 4.2.1, which adds full support for Rails 5 by removing a dependency on Sinatra which was one of the remaining Rails 5 blockers.
Major things to check: Sidekiq still works, obviously. Also that the Web UI/Admin dashboard works and doesn't lose any functionality (based on my testing it works fine).
Working toward #14286.
Changelog: https://github.com/mperham/sidekiq/blob/921e939f995fbb5238975d4121d728b95be99ab5/Changes.md#421
See merge request !6349
Diffstat (limited to 'doc/intro')
0 files changed, 0 insertions, 0 deletions