diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-08-16 18:06:59 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-08-16 22:06:31 +0200 |
| commit | dc8e1676cda528cfca9ec9679da10ff90ec76282 (patch) | |
| tree | 72e2f128c7c72d5bf9d600aa91cd036a33d9fac9 /Gemfile.lock | |
| parent | 374cdda3c0072218126f717f85f321b566a3262f (diff) | |
| download | gitlab-ce-dc8e1676cda528cfca9ec9679da10ff90ec76282.tar.gz | |
Upgrade grape to 1.0
Main feature was the deprication of the Hashie stuff, so the access by
calling keys as method is gone now.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f7ad7bcbc6e..1554f314d1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -342,12 +342,9 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (0.19.2) + grape (1.0.0) activesupport builder - hashie (>= 2.1.0) - multi_json (>= 1.3.2) - multi_xml (>= 0.5.2) mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept @@ -355,9 +352,9 @@ GEM grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) - grape-route-helpers (2.0.0) + grape-route-helpers (2.1.0) activesupport - grape (~> 0.16, >= 0.16.0) + grape (>= 0.16.0) rake grpc (1.4.0) google-protobuf (~> 3.1) @@ -375,7 +372,7 @@ GEM thor tilt hashdiff (0.3.4) - hashie (3.5.5) + hashie (3.5.6) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) @@ -1035,9 +1032,9 @@ DEPENDENCIES gon (~> 6.1.0) google-api-client (~> 0.8.6) gpgme - grape (~> 0.19.2) + grape (~> 1.0) grape-entity (~> 0.6.0) - grape-route-helpers (~> 2.0.0) + grape-route-helpers (~> 2.1.0) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes |