From 2d26275c8cfd6be16b788b0ac13641585857ac52 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Mon, 13 Sep 2021 20:33:06 +0200 Subject: [PATCH 1/2] Use load_server only on Rails 6 onwards 5.x doesn't know this. --- config.ru | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config.ru b/config.ru index ad1fbf29..949a0571 100644 --- a/config.ru +++ b/config.ru @@ -1,6 +1,8 @@ +# frozen_string_literal: true + # This file is used by Rack-based servers to start the application. require_relative 'config/environment' run Rails.application -Rails.application.load_server +Rails.application.load_server if Rails::VERSION::MAJOR == 6 From 1373ec5bc566933edd905456c358145cc05324df Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Mon, 13 Sep 2021 20:33:56 +0200 Subject: [PATCH 2/2] Fix cookie serialization We used to use :marshal, setup :hybrid as default for now. --- config/initializers/cookies_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb index 5a6a32d3..f51a497e 100644 --- a/config/initializers/cookies_serializer.rb +++ b/config/initializers/cookies_serializer.rb @@ -2,4 +2,4 @@ # Specify a serializer for the signed and encrypted cookie jars. # Valid options are :json, :marshal, and :hybrid. -Rails.application.config.action_dispatch.cookies_serializer = :json +Rails.application.config.action_dispatch.cookies_serializer = :hybrid