diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2015-12-31 14:46:07 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2015-12-31 14:46:07 +0000 |
| commit | ab08321be8405eab07929bb3df8bd2dcc14dc063 (patch) | |
| tree | 39b8fe1df5ff92fe1754e668ddd84e179beddc7e | |
| parent | 8e983d33d7179d1ad582c122591cd80182e4c0c7 (diff) | |
| parent | 6d5202e2b6bcb563d6998ed530b6ecd9f4748156 (diff) | |
| download | gitlab-ce-ab08321be8405eab07929bb3df8bd2dcc14dc063.tar.gz | |
Merge branch 'update-allocations-gem' into 'master'
See merge request !2262
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c4cadbafa26..9769ae80a7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,7 +49,7 @@ GEM addressable (2.3.8) after_commit_queue (1.3.0) activerecord (>= 3.0) - allocations (1.0.1) + allocations (1.0.3) annotate (2.6.10) activerecord (>= 3.2, <= 4.3) rake (~> 10.4) |