Commit a2456832d2210f53602c03eaa3ab1efa6207a4d1
1 parent
a4ff0125
Exists in
master
and in
4 other branches
Update sidekiq & devise
Showing
1 changed file
with
9 additions
and
9 deletions
Show diff stats
Gemfile.lock
@@ -76,7 +76,7 @@ GEM | @@ -76,7 +76,7 @@ GEM | ||
76 | carrierwave (0.8.0) | 76 | carrierwave (0.8.0) |
77 | activemodel (>= 3.2.0) | 77 | activemodel (>= 3.2.0) |
78 | activesupport (>= 3.2.0) | 78 | activesupport (>= 3.2.0) |
79 | - celluloid (0.13.0) | 79 | + celluloid (0.14.0) |
80 | timers (>= 1.0.0) | 80 | timers (>= 1.0.0) |
81 | charlock_holmes (0.6.9.4) | 81 | charlock_holmes (0.6.9.4) |
82 | chosen-rails (0.9.8) | 82 | chosen-rails (0.9.8) |
@@ -106,7 +106,7 @@ GEM | @@ -106,7 +106,7 @@ GEM | ||
106 | database_cleaner (0.9.1) | 106 | database_cleaner (0.9.1) |
107 | debug_inspector (0.0.2) | 107 | debug_inspector (0.0.2) |
108 | descendants_tracker (0.0.1) | 108 | descendants_tracker (0.0.1) |
109 | - devise (2.2.3) | 109 | + devise (2.2.4) |
110 | bcrypt-ruby (~> 3.0) | 110 | bcrypt-ruby (~> 3.0) |
111 | orm_adapter (~> 0.1) | 111 | orm_adapter (~> 0.1) |
112 | railties (~> 3.1) | 112 | railties (~> 3.1) |
@@ -260,7 +260,7 @@ GEM | @@ -260,7 +260,7 @@ GEM | ||
260 | minitest (4.7.4) | 260 | minitest (4.7.4) |
261 | modernizr (2.6.2) | 261 | modernizr (2.6.2) |
262 | sprockets (~> 2.0) | 262 | sprockets (~> 2.0) |
263 | - multi_json (1.7.2) | 263 | + multi_json (1.7.3) |
264 | multi_xml (0.5.3) | 264 | multi_xml (0.5.3) |
265 | multipart-post (1.2.0) | 265 | multipart-post (1.2.0) |
266 | mysql2 (0.3.11) | 266 | mysql2 (0.3.11) |
@@ -365,7 +365,7 @@ GEM | @@ -365,7 +365,7 @@ GEM | ||
365 | redis-activesupport (3.2.3) | 365 | redis-activesupport (3.2.3) |
366 | activesupport (~> 3.2.3) | 366 | activesupport (~> 3.2.3) |
367 | redis-store (~> 1.1.0) | 367 | redis-store (~> 1.1.0) |
368 | - redis-namespace (1.2.1) | 368 | + redis-namespace (1.3.0) |
369 | redis (~> 3.0.0) | 369 | redis (~> 3.0.0) |
370 | redis-rack (1.4.2) | 370 | redis-rack (1.4.2) |
371 | rack (~> 1.4.1) | 371 | rack (~> 1.4.1) |
@@ -416,11 +416,11 @@ GEM | @@ -416,11 +416,11 @@ GEM | ||
416 | sexp_processor (4.2.1) | 416 | sexp_processor (4.2.1) |
417 | shoulda-matchers (1.3.0) | 417 | shoulda-matchers (1.3.0) |
418 | activesupport (>= 3.0.0) | 418 | activesupport (>= 3.0.0) |
419 | - sidekiq (2.11.1) | ||
420 | - celluloid (~> 0.13.0) | ||
421 | - connection_pool (~> 1.0) | ||
422 | - multi_json (~> 1) | ||
423 | - redis (~> 3) | 419 | + sidekiq (2.12.0) |
420 | + celluloid (>= 0.14.0) | ||
421 | + connection_pool (>= 1.0.0) | ||
422 | + json | ||
423 | + redis (>= 3.0) | ||
424 | redis-namespace | 424 | redis-namespace |
425 | simple_oauth (0.1.9) | 425 | simple_oauth (0.1.9) |
426 | simplecov (0.7.1) | 426 | simplecov (0.7.1) |