Commit 9360c7334a90349c006be772f603a0977654c263
Merge branch 'celluloid_update' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable
Showing
1 changed file
with
4 additions
and
4 deletions
Show diff stats
Gemfile.lock
| @@ -67,7 +67,7 @@ GEM | @@ -67,7 +67,7 @@ GEM | ||
| 67 | carrierwave (0.8.0) | 67 | carrierwave (0.8.0) |
| 68 | activemodel (>= 3.2.0) | 68 | activemodel (>= 3.2.0) |
| 69 | activesupport (>= 3.2.0) | 69 | activesupport (>= 3.2.0) |
| 70 | - celluloid (0.14.0) | 70 | + celluloid (0.14.1) |
| 71 | timers (>= 1.0.0) | 71 | timers (>= 1.0.0) |
| 72 | charlock_holmes (0.6.9.4) | 72 | charlock_holmes (0.6.9.4) |
| 73 | childprocess (0.3.9) | 73 | childprocess (0.3.9) |
| @@ -87,7 +87,7 @@ GEM | @@ -87,7 +87,7 @@ GEM | ||
| 87 | coffee-script-source (1.6.2) | 87 | coffee-script-source (1.6.2) |
| 88 | colored (1.2) | 88 | colored (1.2) |
| 89 | colorize (0.5.8) | 89 | colorize (0.5.8) |
| 90 | - connection_pool (1.0.0) | 90 | + connection_pool (1.1.0) |
| 91 | coveralls (0.6.7) | 91 | coveralls (0.6.7) |
| 92 | colorize | 92 | colorize |
| 93 | multi_json (~> 1.3) | 93 | multi_json (~> 1.3) |
| @@ -445,8 +445,8 @@ GEM | @@ -445,8 +445,8 @@ GEM | ||
| 445 | sexp_processor (4.2.1) | 445 | sexp_processor (4.2.1) |
| 446 | shoulda-matchers (2.1.0) | 446 | shoulda-matchers (2.1.0) |
| 447 | activesupport (>= 3.0.0) | 447 | activesupport (>= 3.0.0) |
| 448 | - sidekiq (2.12.0) | ||
| 449 | - celluloid (>= 0.14.0) | 448 | + sidekiq (2.12.4) |
| 449 | + celluloid (>= 0.14.1) | ||
| 450 | connection_pool (>= 1.0.0) | 450 | connection_pool (>= 1.0.0) |
| 451 | json | 451 | json |
| 452 | redis (>= 3.0) | 452 | redis (>= 3.0) |