Commit b772a8d6 authored by Andrew Newdigate's avatar Andrew Newdigate
Browse files

Merge branch 'mk-grpc-1.38' into 'master'

Update grpc + tools to 1.38

See merge request gitlab-org/labkit-ruby!77
parents 8b124b63 f2767074
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
  # Please maintain alphabetical order for dependencies
  spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 7.0.0"
  spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 7.0.0"
  spec.add_runtime_dependency "grpc", "~> 1.19" # Be sure to update the "grpc-tools" dev_depenency too
  spec.add_runtime_dependency "grpc", "~> 1.38" # Be sure to update the "grpc-tools" dev_dependency too
  spec.add_runtime_dependency "jaeger-client", "~> 1.1"
  spec.add_runtime_dependency "opentracing", "~> 0.4"
  spec.add_runtime_dependency "pg_query", "~> 2.1"
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
  spec.add_development_dependency "excon", "~> 0.78.1"
  spec.add_development_dependency "faraday", "~> 1.2.0"
  spec.add_development_dependency "gitlab-styles", "~> 6.2.0"
  spec.add_development_dependency "grpc-tools", "~> 1.19"
  spec.add_development_dependency "grpc-tools", "~> 1.38"
  spec.add_development_dependency "httparty", "~> 0.17.3"
  spec.add_development_dependency "httpclient", "~> 2.8.3"
  spec.add_development_dependency "pry", "~> 0.12"