summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-11-25 04:05:17 +0000
committerRobert Speicher <robert@gitlab.com>2016-11-25 04:05:17 +0000
commit5522b9dc0e488a4561e7791c8d85e39615da2901 (patch)
tree1e235228d8d2f0b6c76b9c96472412233fead539 /Gemfile.lock
parentd9eb2f2cf5525547fefb9a70663fe06e9f9e61ae (diff)
parent0dc108507479b7dbd1d31ceab1989e13f766d613 (diff)
downloadgitlab-ce-5522b9dc0e488a4561e7791c8d85e39615da2901.tar.gz
Merge branch 'zj-upgrade-grape' into 'master'
Update grape-entity to 0.6.0 See merge request !7491
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3684974a766..bf9702b2562 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -292,7 +292,7 @@ GEM
rack-accept
rack-mount
virtus (>= 1.0.0)
- grape-entity (0.4.8)
+ grape-entity (0.6.0)
activesupport
multi_json (>= 1.3.2)
haml (4.0.7)
@@ -838,7 +838,7 @@ DEPENDENCIES
gollum-rugged_adapter (~> 0.4.2)
gon (~> 6.1.0)
grape (~> 0.15.0)
- grape-entity (~> 0.4.2)
+ grape-entity (~> 0.6.0)
haml_lint (~> 0.18.2)
hamlit (~> 2.6.1)
health_check (~> 2.2.0)