From 55a6b23cd84395029aa92605f8aae73f37f57c4a Mon Sep 17 00:00:00 2001 From: Wasif Hossain Date: Sat, 8 Jun 2019 23:45:21 +0600 Subject: [PATCH 1/2] Configure `ActionDispatch::Response#content_type` behavior on Rails 6+ in order to retain old behavior, set `config.action_dispatch.return_only_media_type_on_content_type` to true it can also be configured by setting `ActionDispatch::Response.return_only_media_type_on_content_type` --- test/support/rails_app.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/support/rails_app.rb b/test/support/rails_app.rb index 718face6..5f81d434 100644 --- a/test/support/rails_app.rb +++ b/test/support/rails_app.rb @@ -9,6 +9,10 @@ module ActiveModelSerializers config.action_controller.perform_caching = true config.action_controller.cache_store = :memory_store + if Rails::VERSION::MAJOR >= 6 + config.action_dispatch.return_only_media_type_on_content_type = true + end + config.filter_parameters += [:password] end From 8a0dad673c6f1e655bff32f922d4365a2e0e1b80 Mon Sep 17 00:00:00 2001 From: Wasif Hossain Date: Sat, 24 Aug 2019 00:19:41 +0600 Subject: [PATCH 2/2] Support jRuby 9.2.8.0 on Travis https://www.jruby.org/2019/08/12/jruby-9-2-8-0.html --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 074ea456..6c5ae507 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ ruby_supported_versions: jruby_supported_versions: - &jruby_9_1 jruby-9.1.17.0 - - &jruby_9_2 jruby-9.2.7.0 + - &jruby_9_2 jruby-9.2.8.0 - &jruby_head jruby-head jdk_supported_versions: