diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-04 21:10:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-04 21:10:03 +0300 |
| commit | 24f8aa38dc0ddd3489f0c98d5dd0517096caf05e (patch) | |
| tree | eaa46caaad6cb5b0e3f4b59ac930c7c2d36396ce /Gemfile.lock | |
| parent | be4b3134a282f7a8812306777abd2d3150deecdc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1054af774c7..1cee984d59b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -518,7 +518,7 @@ GEM signet (~> 0.12) google-cloud-env (1.4.0) faraday (>= 0.17.3, < 2.0) - google-protobuf (3.15.8) + google-protobuf (3.14.0) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) googleauth (0.14.0) @@ -1466,7 +1466,7 @@ DEPENDENCIES gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) google-api-client (~> 0.33) - google-protobuf (~> 3.15.8) + google-protobuf (~> 3.14.0) gpgme (~> 2.0.19) grape (~> 1.5.2) grape-entity (~> 0.7.1) |