1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00

merge master

This commit is contained in:
Mike Perham 2016-06-30 21:10:00 -07:00
commit d8bd483e63
2 changed files with 8 additions and 1 deletions

View file

@ -1,5 +1,12 @@
# Sidekiq Changes
4.1.4
-----------
- Unlock Sinatra so a Rails 5.0 compatible version may be used [#3048]
- Fix race condition on startup with JRuby [#3043]
4.1.3
-----------

View file

@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
gem.add_dependency 'redis', '~> 3.2', '>= 3.2.1'
gem.add_dependency 'connection_pool', '~> 2.2', '>= 2.2.0'
gem.add_dependency 'concurrent-ruby', '~> 1.0'
gem.add_dependency 'sinatra', '>= 1.4.6'
gem.add_dependency 'sinatra', '>= 1.4.7'
gem.add_development_dependency 'redis-namespace', '~> 1.5', '>= 1.5.2'
gem.add_development_dependency 'minitest', '~> 5.7', '>= 5.7.0'
gem.add_development_dependency 'rake', '~> 10.0'