Commit 92ebb238 authored by Andrew Newdigate's avatar Andrew Newdigate
Browse files

Merge branch 'igor.drozdov-master-patch-15920' into 'master'

Support actionpack and activesupport 6.x

See merge request gitlab-org/labkit-ruby!53
parents 09f9f27e 92ec7621
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
  spec.required_ruby_version = ">= 2.4.0"

  # Please maintain alphabetical order for dependencies
  spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 6.1.0"
  spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 6.1.0"
  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 "gitlab-pg_query", "~> 1.3"
  spec.add_runtime_dependency "grpc", "~> 1.19" # Be sure to update the "grpc-tools" dev_depenency too
  spec.add_runtime_dependency "jaeger-client", "~> 1.1"