Merge branch 'update-allocations' into 'master'

Updated the allocations Gem to 1.0.4 Sometimes the output of Allocations.to_hash may contain garbage. See https://gitlab.com/gitlab-org/allocations/commit/15d3a39f51392013dcf5f88dd21fab31201350ce for more information. See merge request !2816

Merge branch 'update-allocations' into 'master'
300e1606 · Yorick Peterse · b4e72516 · 852bd109 · 300e1606
Commit 300e1606 authored Feb 17, 2016 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,7 +50,7 @@ GEM
    after_commit_queue (1.3.0)
      activerecord (>= 3.0)
    akismet (2.0.0)
-    allocations (1.0.3)
+    allocations (1.0.4)
    annotate (2.6.10)
      activerecord (>= 3.2, <= 4.3)
      rake (~> 10.4)