nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5393 from pravi/patch-1

Browse source 
bump sidekiq to 3.2.6
This commit is contained in:
Jonne Haß 2014-11-17 13:03:43 +01:00
commit 2b41316693
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -30,7 +30,7 @@ gem 'simple_captcha2', '0.3.2', :require => 'simple_captcha'
# Background processing # Background processing
gem 'sidekiq', '3.2.5' gem 'sidekiq', '3.2.6'
gem 'sinatra', '1.3.3' gem 'sinatra', '1.3.3'
# Scheduled processing # Scheduled processing

4
Gemfile.lock
View file

@ -488,7 +488,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip (~> 1.0) rubyzip (~> 1.0)
websocket (~> 1.0) websocket (~> 1.0)
sidekiq (3.2.5) sidekiq (3.2.6)
celluloid (= 0.15.2) celluloid (= 0.15.2)
connection_pool (>= 2.0.0) connection_pool (>= 2.0.0)
json json
@ -651,7 +651,7 @@ DEPENDENCIES
ruby-oembed (= 0.8.11) ruby-oembed (= 0.8.11)
sass-rails (= 4.0.4) sass-rails (= 4.0.4)
selenium-webdriver (= 2.44.0) selenium-webdriver (= 2.44.0)
sidekiq (= 3.2.5) sidekiq (= 3.2.6)
sidetiq (= 0.6.3) sidetiq (= 0.6.3)
simple_captcha2 (= 0.3.2) simple_captcha2 (= 0.3.2)
sinatra (= 1.3.3) sinatra (= 1.3.3)