Merge branch 'celluloid_update' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable

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)