diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-11-21 09:09:19 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-11-23 16:58:39 +0100 |
| commit | 42fe0cac09fc335a8704b23bfbd219645914ee41 (patch) | |
| tree | b3eea3f41079d394ba535a3df53f420e8a20e29e | |
| parent | 2282a3bd67d32555517d150c1e471d714e51d410 (diff) | |
| download | gitlab-ce-42fe0cac09fc335a8704b23bfbd219645914ee41.tar.gz | |
Upgrade grape-entity to 0.6.0
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-upgrade-grape.yml | 2 | ||||
| -rw-r--r-- | spec/serializers/environment_serializer_spec.rb | 4 |
4 files changed, 5 insertions, 8 deletions
@@ -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 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) diff --git a/changelogs/unreleased/zj-upgrade-grape.yml b/changelogs/unreleased/zj-upgrade-grape.yml index 75a72283d1e..1df42d98733 100644 --- a/changelogs/unreleased/zj-upgrade-grape.yml +++ b/changelogs/unreleased/zj-upgrade-grape.yml @@ -1,4 +1,4 @@ --- -title: Update grape entity to 0.5.2 +title: Update grape entity to 0.6.0 merge_request: 7491 author: diff --git a/spec/serializers/environment_serializer_spec.rb b/spec/serializers/environment_serializer_spec.rb index 8f95c9250b0..b7ed4eb0239 100644 --- a/spec/serializers/environment_serializer_spec.rb +++ b/spec/serializers/environment_serializer_spec.rb @@ -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) |