diff options
| author | Toon Claes <toon@gitlab.com> | 2021-05-26 12:07:10 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-05-26 12:07:10 +0300 |
| commit | 3d6ef137951e3e8971b1051ecc2a3cea04773e61 (patch) | |
| tree | 11cbc6dfc7616f5ada8009fc0159fb15df064e5c | |
| parent | 7da5e5123d3ce18d45f60f101109c4aeafecc958 (diff) | |
| parent | 904af72eb7c42124978370cef53681fa561b10f5 (diff) | |
Merge branch 'ruby30-poc-1' into 'master'
Update gitlab-labkit to 0.17.1 to update pg_query to 2.0.3
Closes #3446
See merge request gitlab-org/gitaly!3395
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index adee2020f..20f1034fc 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.16.2' +gem 'gitlab-labkit', '~> 0.17.1' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 4f69a63aa..af6a3ce81 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -65,13 +65,13 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.16.2) + gitlab-labkit (0.17.1) 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 (~> 1.3) + pg_query (~> 2.0) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) google-protobuf (3.14.0) @@ -121,7 +121,8 @@ GEM parallel (1.19.2) parser (2.7.2.0) ast (~> 2.4.1) - pg_query (1.3.0) + pg_query (2.0.3) + google-protobuf (~> 3.15.5) proc_to_ast (0.1.0) coderay parser @@ -221,7 +222,7 @@ DEPENDENCIES github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.10.gitlab.1) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.16.2) + gitlab-labkit (~> 0.17.1) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.14.0) grpc (~> 1.30.2) |