diff options
author | Stan Hu <stanhu@gmail.com> | 2018-06-20 16:33:22 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-06-20 16:33:22 +0000 |
commit | c9eb56d511eeda596741045ab1964bfba0e6186e (patch) | |
tree | a692b873fac674b35fbfed92fcee30b16a8115d8 /Gemfile.lock | |
parent | 40a66cb550cf7b5e1b0a6e3816b91026ba2dd6ca (diff) | |
parent | d527b468025922c04ba03edffb7ef33300ec9bb6 (diff) | |
download | gitlab-ce-c9eb56d511eeda596741045ab1964bfba0e6186e.tar.gz |
Merge branch 'remove-allocations-gem' into 'master'
Remove remaining traces of the Allocations Gem
See merge request gitlab-org/gitlab-ce!20029
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b92ac38a5c3..3c619b2e534 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,7 +49,6 @@ GEM public_suffix (>= 2.0.2, < 4.0) aes_key_wrap (1.0.1) akismet (2.0.0) - allocations (1.0.5) arel (6.0.4) asana (0.6.0) faraday (~> 0.9) @@ -974,7 +973,6 @@ DEPENDENCIES acts-as-taggable-on (~> 5.0) addressable (~> 2.5.2) akismet (~> 2.0) - allocations (~> 1.0) asana (~> 0.6.0) asciidoctor (~> 1.5.6) asciidoctor-plantuml (= 0.0.8) |