diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-08-05 09:11:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 09:11:02 -0500 |
| commit | 616f3611d525b97c5cdb1a5feee25621cca27daf (patch) | |
| tree | 79591ed29b2a9670519438bce2d53f1a096cee06 /railties | |
| parent | bb7599a6c84aba44cbb5f21486ffdb4a549717dd (diff) | |
| parent | 6df24c693ed50a66feaf116c90df7eba5acf4033 (diff) | |
| download | rails-616f3611d525b97c5cdb1a5feee25621cca27daf.tar.gz rails-616f3611d525b97c5cdb1a5feee25621cca27daf.tar.bz2 rails-616f3611d525b97c5cdb1a5feee25621cca27daf.zip | |
Merge branch 'master' into ast-module
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 1 | ||||
| -rw-r--r-- | railties/test/application/configuration_test.rb | 4 |
2 files changed, 2 insertions, 3 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 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 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 |