Merge pull request #23981 from y-yagi/do_not_set_action_cable_config

do not set Action Cable's config when specify `--skip-action-cable` option

1 files changed, 3 insertions, 4 deletions

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 0fc1179339..5205c0ef0a 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
@@ -44,6 +44,9 @@ Rails.application.configure do
   # Action Cable endpoint configuration
   # config.action_cable.url = 'wss://example.com/cable'
   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
+  # Don't mount Action Cable in the main server process.
+  # config.action_cable.mount_path = nil
   <%- end -%>
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
@@ -91,9 +94,5 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
-
-  # Don't mount Action Cable in the main server process.
-  # config.action_cable.mount_path = nil
-  # config.action_cable.url = "ws://example.com"
   <%- end -%>
 end