Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mperham/sidekiq
...
head fork: mperham/sidekiq
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
6 Changes.md
@@ -1,3 +1,9 @@
+2.17.8
+-----------
+
+- Tighten allowed gem versions to prevent future incompatibility. Fixes
+ breakage with Celluloid 0.16.
+
2.17.7
-----------
View
2  lib/sidekiq/version.rb
@@ -1,3 +1,3 @@
module Sidekiq
- VERSION = "2.17.7"
+ VERSION = "2.17.8"
end
View
10 sidekiq.gemspec
@@ -14,14 +14,14 @@ Gem::Specification.new do |gem|
gem.name = "sidekiq"
gem.require_paths = ["lib"]
gem.version = Sidekiq::VERSION
- gem.add_dependency 'redis', '>= 3.0.6'
- gem.add_dependency 'redis-namespace', '>= 1.3.1'
- gem.add_dependency 'connection_pool', '>= 1.0.0'
- gem.add_dependency 'celluloid', '>= 0.15.2'
+ gem.add_dependency 'redis', '~> 3.1'
+ gem.add_dependency 'redis-namespace', '~> 1.3'
+ gem.add_dependency 'connection_pool', '~> 2.0'
+ gem.add_dependency 'celluloid', '0.15.2'
gem.add_dependency 'json'
gem.add_development_dependency 'sinatra'
gem.add_development_dependency 'minitest', '~> 4.2'
gem.add_development_dependency 'rake'
- gem.add_development_dependency 'rails', '>= 4.0.0'
+ gem.add_development_dependency 'rails', '4.0.5'
gem.add_development_dependency 'coveralls'
end
View
2  web/views/_workers.erb
@@ -16,7 +16,7 @@
<td>
<div class="args"><%= display_args(msg['payload']['args']) %></div>
</td>
- <td><%= relative_time(run_at.is_a?(String) ? DateTime.parse(run_at) : run_at) %></td>
+ <td><%= relative_time(Time.at(msg['run_at'])) %></td>
</tr>
<% end %>
</table>

No commit comments for this range

Something went wrong with that request. Please try again.