Commit b382a21b authored by Robert Speicher's avatar Robert Speicher Committed by Rémy Coutable

Merge branch 'zj-upgrade-grape' into 'master'

Update grape-entity to 0.6.0

See merge request !7491
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent e78182a5
...@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist' ...@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
# API # API
gem 'grape', '~> 0.15.0' gem 'grape', '~> 0.15.0'
gem 'grape-entity', '~> 0.4.2' gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# Pagination # Pagination
......
...@@ -322,7 +322,7 @@ GEM ...@@ -322,7 +322,7 @@ GEM
rack-accept rack-accept
rack-mount rack-mount
virtus (>= 1.0.0) virtus (>= 1.0.0)
grape-entity (0.4.8) grape-entity (0.6.0)
activesupport activesupport
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
haml (4.0.7) haml (4.0.7)
...@@ -873,7 +873,7 @@ DEPENDENCIES ...@@ -873,7 +873,7 @@ DEPENDENCIES
gollum-rugged_adapter (~> 0.4.2) gollum-rugged_adapter (~> 0.4.2)
gon (~> 6.1.0) gon (~> 6.1.0)
grape (~> 0.15.0) grape (~> 0.15.0)
grape-entity (~> 0.4.2) grape-entity (~> 0.6.0)
haml_lint (~> 0.18.2) haml_lint (~> 0.18.2)
hamlit (~> 2.6.1) hamlit (~> 2.6.1)
health_check (~> 2.2.0) health_check (~> 2.2.0)
......
---
title: Update grape entity to 0.6.0
merge_request: 7491
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment