diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-27 20:57:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-27 20:57:12 +0000 |
| commit | 9360c7334a90349c006be772f603a0977654c263 (patch) | |
| tree | 05ced9072cb80706a6a34ec2afa1c31916d3b1a1 | |
| parent | aed4e0f0e0389da8c4e11b7e265a0fdad3482484 (diff) | |
| parent | 56a83cdff6a03692ed83b0b5fae06f140d8ab81c (diff) | |
| download | gitlab-ce-9360c7334a90349c006be772f603a0977654c263.tar.gz | |
Merge branch 'celluloid_update' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c26eeede69f..c64bd426540 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,7 +67,7 @@ GEM carrierwave (0.8.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) - celluloid (0.14.0) + celluloid (0.14.1) timers (>= 1.0.0) charlock_holmes (0.6.9.4) childprocess (0.3.9) @@ -87,7 +87,7 @@ GEM coffee-script-source (1.6.2) colored (1.2) colorize (0.5.8) - connection_pool (1.0.0) + connection_pool (1.1.0) coveralls (0.6.7) colorize multi_json (~> 1.3) @@ -445,8 +445,8 @@ GEM sexp_processor (4.2.1) shoulda-matchers (2.1.0) activesupport (>= 3.0.0) - sidekiq (2.12.0) - celluloid (>= 0.14.0) + sidekiq (2.12.4) + celluloid (>= 0.14.1) connection_pool (>= 1.0.0) json redis (>= 3.0) |