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 | |
| 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
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 13 |
2 files changed, 5 insertions, 11 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index bbaed6b6a47..c9b4b30c1f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -673,11 +673,11 @@ GEM rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.1.4) + sidekiq (4.2.1) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) + rack-protection (~> 1.5) 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) @@ -687,10 +687,6 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) slack-notifier (1.2.1) slop (3.6.0) spinach (0.8.10) @@ -960,10 +956,9 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.0) + sidekiq (~> 4.2) sidekiq-cron (~> 0.4.0) simplecov (= 0.12.0) - sinatra (~> 1.4.4) slack-notifier (~> 1.2.0) spinach-rails (~> 0.2.1) spinach-rerun-reporter (~> 0.0.2) @@ -996,4 +991,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.12.5 + 1.13.0 |