diff --git a/appraisal/ruby-2.4.10.rb b/appraisal/ruby-2.4.10.rb index 055012cbfa3..506e455d947 100644 --- a/appraisal/ruby-2.4.10.rb +++ b/appraisal/ruby-2.4.10.rb @@ -90,7 +90,7 @@ end appraise 'activesupport' do - gem 'activesupport', '~> 4' + gem 'activesupport' gem 'actionpack' gem 'actionview' diff --git a/gemfiles/ruby_2.4.10_activesupport.gemfile b/gemfiles/ruby_2.4.10_activesupport.gemfile index e04fc5cac25..05f298164fa 100644 --- a/gemfiles/ruby_2.4.10_activesupport.gemfile +++ b/gemfiles/ruby_2.4.10_activesupport.gemfile @@ -32,7 +32,7 @@ gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0" gem "opentracing", ">= 0.4.1" gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1", "< 3.19.2"] gem "docile", "~> 1.3.5" -gem "activesupport", "~> 4" +gem "activesupport" gem "actionpack" gem "actionview" gem "active_model_serializers", ">= 0.10.0" diff --git a/gemfiles/ruby_2.4.10_activesupport.gemfile.lock b/gemfiles/ruby_2.4.10_activesupport.gemfile.lock index f728d00594f..8277b7fce31 100644 --- a/gemfiles/ruby_2.4.10_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.4.10_activesupport.gemfile.lock @@ -11,31 +11,30 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (4.2.11.3) - actionview (= 4.2.11.3) - activesupport (= 4.2.11.3) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11.3) - activesupport (= 4.2.11.3) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) active_model_serializers (0.10.13) actionpack (>= 4.1, < 7.1) activemodel (>= 4.1, < 7.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activemodel (4.2.11.3) - activesupport (= 4.2.11.3) - builder (~> 3.1) - activesupport (4.2.11.3) - i18n (~> 0.7) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activesupport (5.2.8.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.4.0) appraisal (2.4.1) @@ -85,7 +84,7 @@ GEM dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - erubis (2.7.0) + erubi (1.12.0) extlz4 (0.3.4) ffi (1.15.5) google-protobuf (3.19.1) @@ -97,7 +96,7 @@ GEM rack (>= 1.3.0) rack-accept hashdiff (1.0.1) - i18n (0.9.5) + i18n (1.14.1) concurrent-ruby (~> 1.0) json-schema (2.8.1) addressable (>= 2.4) @@ -136,24 +135,23 @@ GEM racecar (2.6.0) king_konf (~> 1.0.0) rdkafka (~> 0.10.0) - rack (1.6.13) + rack (2.2.8) rack-accept (0.4.5) rack (>= 0.4) - rack-test (0.6.3) - rack (>= 1.0) - rails-deprecated_sanitizer (1.0.4) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - railties (4.2.11.3) - actionpack (= 4.2.11.3) - activesupport (= 4.2.11.3) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) + method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rake (13.0.6) rake-compiler (1.2.5) rake @@ -212,7 +210,7 @@ DEPENDENCIES actionpack actionview active_model_serializers (>= 0.10.0) - activesupport (~> 4) + activesupport addressable (~> 2.4.0) appraisal (~> 2.4.0) benchmark-ips (~> 2.8)