Verified Commit d4b76198 authored by Peter Leitzen's avatar Peter Leitzen Committed by GitLab
Browse files

Merge branch 'permit-rails-8-1' into 'master' 

Support rails 8.1 version

See merge request !296

Merged-by: default avatarPeter Leitzen <pleitzen@gitlab.com>
Approved-by: default avatarPeter Leitzen <pleitzen@gitlab.com>
Co-authored-by: andrey's avatarandrey <acunskis@gitlab.com>
parents 9adf1516 be476081

gitlab-labkit.gemspec

+3 −3
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ Gem::Specification.new do |spec| 
  spec.required_ruby_version = ">= 3.3", "< 5"



  # Please maintain alphabetical order for dependencies

  spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.1.0"

  spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 8.1.0"

  spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 8.2.0"

  spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 8.2.0"

  spec.add_runtime_dependency "grpc", ">= 1.75" # Be sure to update the "grpc-tools" dev_dependency too

  spec.add_runtime_dependency "google-protobuf", ">= 3.25", "< 5.0"

  spec.add_runtime_dependency "jaeger-client", "~> 1.1.0"
@@ -49,7 +49,7 @@ Gem::Specification.new do |spec| 
  spec.add_development_dependency "pry", "~> 0.12"

  spec.add_development_dependency "pry-byebug", "~> 3.11"

  spec.add_development_dependency "rack", "~> 2.0"

  spec.add_development_dependency "railties", ">= 5.0.0", "< 8.1.0"

  spec.add_development_dependency "railties", ">= 5.0.0", "< 8.2.0"

  spec.add_development_dependency "rake", "~> 13.2"

  spec.add_development_dependency "rest-client", "~> 2.1.0"

  spec.add_development_dependency "rspec", "~> 3.12.0"

spec/labkit/excon_publisher_spec.rb

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ describe Labkit::ExconPublisher do 
          [

            {

              method: "GET", code: "200",

              scheme: "http", host: "127.0.0.1", port: 9202, path: "/api/v1/tests", query: "abc=1&nil_key=&xyz=2",

              scheme: "http", host: "127.0.0.1", port: 9202, path: "/api/v1/tests", query: "abc=1&nil_key&xyz=2",

            },

          ],

        ],