diff options
author | Robert Speicher <robert@gitlab.com> | 2016-11-25 07:05:17 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-11-25 12:43:00 +0300 |
commit | b382a21bf54ee91dd796963b112493f469155959 (patch) | |
tree | 7dca7e18ed59f3de57787be4947b36ccea642354 /Gemfile.lock | |
parent | e78182a5faff7ed1cea59dea901ff8602b8ad638 (diff) |
Merge branch 'zj-upgrade-grape' into 'master'
Update grape-entity to 0.6.0
See merge request !7491
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 26c4dc0d23f..06c381d9c5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -322,7 +322,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) @@ -873,7 +873,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) |