Commit 2f7aba84 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'upgrade-grape-path-helpers' into 'master'

Upgrade grape-path-helpers to 1.7.0

See merge request gitlab-org/gitlab!68916
parents 9f2cc6df 0a82a7e9
...@@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.4.0' ...@@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.4.0'
gem 'pg', '~> 1.1' gem 'pg', '~> 1.1'
gem 'rugged', '~> 1.1' gem 'rugged', '~> 1.1'
gem 'grape-path-helpers', '~> 1.6.3' gem 'grape-path-helpers', '~> 1.7.0'
gem 'faraday', '~> 1.0' gem 'faraday', '~> 1.0'
gem 'marginalia', '~> 1.10.0' gem 'marginalia', '~> 1.10.0'
......
...@@ -546,7 +546,7 @@ GEM ...@@ -546,7 +546,7 @@ GEM
grape-entity (0.9.0) grape-entity (0.9.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
grape-path-helpers (1.6.3) grape-path-helpers (1.7.0)
activesupport activesupport
grape (~> 1.3) grape (~> 1.3)
rake (> 12) rake (> 12)
...@@ -1493,7 +1493,7 @@ DEPENDENCIES ...@@ -1493,7 +1493,7 @@ DEPENDENCIES
gpgme (~> 2.0.19) gpgme (~> 2.0.19)
grape (~> 1.5.2) grape (~> 1.5.2)
grape-entity (~> 0.9.0) grape-entity (~> 0.9.0)
grape-path-helpers (~> 1.6.3) grape-path-helpers (~> 1.7.0)
grape_logging (~> 1.7) grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10) graphiql-rails (~> 1.4.10)
graphlient (~> 0.4.0) graphlient (~> 0.4.0)
......
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