summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-11-21 09:09:19 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-11-23 16:58:39 +0100
commit42fe0cac09fc335a8704b23bfbd219645914ee41 (patch)
treeb3eea3f41079d394ba535a3df53f420e8a20e29e /Gemfile.lock
parent2282a3bd67d32555517d150c1e471d714e51d410 (diff)
downloadgitlab-ce-42fe0cac09fc335a8704b23bfbd219645914ee41.tar.gz
Upgrade grape-entity to 0.6.0
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 331ffd89148..cf2ebaa00d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -316,7 +316,8 @@ GEM
rack-accept
rack-mount
virtus (>= 1.0.0)
- grape-entity (0.5.2)
+ grape-entity (0.6.0)
+ activesupport
multi_json (>= 1.3.2)
haml (4.0.7)
tilt
@@ -868,7 +869,7 @@ DEPENDENCIES
gollum-rugged_adapter (~> 0.4.2)
gon (~> 6.1.0)
grape (~> 0.15.0)
- grape-entity (~> 0.5.2)
+ grape-entity (~> 0.6.0)
haml_lint (~> 0.18.2)
hamlit (~> 2.6.1)
health_check (~> 2.2.0)