Upgrade grape-entity to 0.6.0

This commit is contained in:
Z.J. van de Weg 2016-11-21 09:09:19 +01:00
parent 2282a3bd67
commit 42fe0cac09
4 changed files with 5 additions and 8 deletions

View File

@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
# API
gem 'grape', '~> 0.15.0'
gem 'grape-entity', '~> 0.5.2'
gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# Pagination

View File

@ -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)

View File

@ -1,4 +1,4 @@
---
title: Update grape entity to 0.5.2
title: Update grape entity to 0.6.0
merge_request: 7491
author:

View File

@ -27,10 +27,6 @@ describe EnvironmentSerializer do
let(:deployable) { create(:ci_build) }
let(:resource) { deployment.environment }
it 'it generates payload for single object' do
expect(json).to be_an_instance_of Hash
end
it 'contains important elements of environment' do
expect(json)
.to include(:name, :external_url, :environment_path, :last_deployment)