diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-05-04 03:47:17 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-04 03:47:17 +0000 |
| commit | 31fa96960f7d224a1da4ca1cf1520a657558567d (patch) | |
| tree | 25eb6d3dc41c7022efe42d1df0ad47cc8fbb669c /Gemfile.lock | |
| parent | ef1bdc443be23b026042a6aeee6352b3652ebed5 (diff) | |
| parent | e50bed7eff276eac2dc1fbb86bddb04d9dd9e70d (diff) | |
| download | gitlab-ce-31fa96960f7d224a1da4ca1cf1520a657558567d.tar.gz | |
Merge branch 'pravi/gitlab-ce-update-grape-entity' into 'master'
Update grape-entity 0.6.0 -> 0.7.1
See merge request gitlab-org/gitlab-ce!18720
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7fd49417c71..f7e2428a07f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -366,8 +366,8 @@ GEM rack (>= 1.3.0) rack-accept virtus (>= 1.0.0) - grape-entity (0.6.0) - activesupport + grape-entity (0.7.1) + activesupport (>= 4.0) multi_json (>= 1.3.2) grape-route-helpers (2.1.0) activesupport @@ -1073,7 +1073,7 @@ DEPENDENCIES google-protobuf (= 3.5.1) gpgme grape (~> 1.0) - grape-entity (~> 0.6.0) + grape-entity (~> 0.7.1) grape-route-helpers (~> 2.1.0) grape_logging (~> 1.7) grpc (~> 1.11.0) |