diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-02-17 09:59:53 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-02-17 09:59:53 +0000 |
| commit | 300e16065a4fca95ff04de96d31e34f57cf9a4a4 (patch) | |
| tree | 750c5151a03e926974a4e771147e135e227d7241 | |
| parent | b4e72516f31d86dfa1bea764d8d08d95f233c7ba (diff) | |
| parent | 852bd109c15f918602ce6bc11485ad3d10509112 (diff) | |
| download | gitlab-ce-300e16065a4fca95ff04de96d31e34f57cf9a4a4.tar.gz | |
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
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 718285e1665..d84cc2d0789 100644 --- 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) |