diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-18 18:10:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-18 18:10:46 +0300 |
| commit | 346c2ebb5a818524c5d8d95dc6b9fc8c892e3b5c (patch) | |
| tree | 63bf068a9d8cedf0b7f9e80cf99e491813617db1 /Gemfile.lock | |
| parent | 5f287a8e306da1e0b6152a0b7f8621a8e71a3fe4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
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 806ee347fdc..34a0fe708a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -538,8 +538,8 @@ GEM mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - grape-entity (0.7.1) - activesupport (>= 4.0) + grape-entity (0.9.0) + activesupport (>= 3.0.0) multi_json (>= 1.3.2) grape-path-helpers (1.6.3) activesupport @@ -1471,7 +1471,7 @@ DEPENDENCIES google-protobuf (~> 3.15.8) gpgme (~> 2.0.19) grape (~> 1.5.2) - grape-entity (~> 0.7.1) + grape-entity (~> 0.9.0) grape-path-helpers (~> 1.6.3) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) |