diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 19:43:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 19:43:42 +0000 |
| commit | 8f3fbbf0d56091ad87158f61bf2a4e96a7f937e3 (patch) | |
| tree | 6749b899adc622297e0443084ef6fd1909fffd00 /Gemfile.lock | |
| parent | de235133e1f8b318b0ee6f49269e576b6e969486 (diff) | |
| download | gitlab-ce-8f3fbbf0d56091ad87158f61bf2a4e96a7f937e3.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3bf70170a73..23876a9ecc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -467,13 +467,13 @@ GEM fog-xml (~> 0.1.0) google-api-client (>= 0.44.2, < 0.51) google-cloud-env (~> 1.2) - gitlab-labkit (0.17.1) + gitlab-labkit (0.16.2) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) - pg_query (~> 2.0) + pg_query (~> 1.3) redis (> 3.0.0, < 5.0.0) gitlab-license (1.5.0) gitlab-mail_room (0.0.9) @@ -516,7 +516,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.6) google-protobuf (~> 3.14) googleauth (0.14.0) @@ -903,8 +903,7 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.2.3) - pg_query (2.0.3) - google-protobuf (~> 3.15.5) + pg_query (1.3.0) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) @@ -1480,7 +1479,7 @@ DEPENDENCIES gitlab-experiment (~> 0.5.4) gitlab-fog-azure-rm (~> 1.0.1) gitlab-fog-google (~> 1.13) - gitlab-labkit (~> 0.17.1) + gitlab-labkit (~> 0.16.2) gitlab-license (~> 1.5) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) @@ -1492,7 +1491,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.9.0) @@ -1573,7 +1572,7 @@ DEPENDENCIES parslet (~> 1.8) peek (~> 1.1) pg (~> 1.1) - pg_query (~> 2.0.3) + pg_query (~> 1.3.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.12.0) |