From 5a6c4c2e52317e128a41e592cdabb46b8c560eca Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sat, 5 Aug 2017 14:01:40 +0900 Subject: Add missing blank line between `config.active_storage` and `config.action_cable` --- .../generators/rails/app/templates/config/environments/production.rb.tt | 1 + 1 file changed, 1 insertion(+) (limited to 'railties') diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 5b16ada442..f68e13aa8b 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -47,6 +47,7 @@ Rails.application.configure do # Store uploaded files on the local file system (see config/storage.yml for options) config.active_storage.service = :local + <%- unless options[:skip_action_cable] -%> # Mount Action Cable outside main process or domain # config.action_cable.mount_path = nil -- cgit v1.2.3 From 1ab1f8759607cae037522717594c02b6c7a7b168 Mon Sep 17 00:00:00 2001 From: George Claghorn Date: Fri, 4 Aug 2017 22:32:34 -0400 Subject: Check for `app.secrets.secret_key_base`, not `app.config.secret_key_base` By default, apps only have the former set. --- railties/test/application/configuration_test.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'railties') diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 381bc2694f..c2f6a5a95c 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -453,10 +453,8 @@ module ApplicationTests secret_key_base: 123 YAML - app "development" - assert_raise(ArgumentError) do - app.key_generator + app "development" end end -- cgit v1.2.3