diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2016-03-01 19:47:43 +0900 | 
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2016-03-01 19:53:39 +0900 | 
| commit | a73adfa5f5d244c3f4292e521efd5781c95dda8a (patch) | |
| tree | ac588db59e8630069e363730f40ddb8e267555f7 /railties/lib/rails/generators | |
| parent | d150f59f114dc2d362b9d8f96df88ca4fea09dc4 (diff) | |
| download | rails-a73adfa5f5d244c3f4292e521efd5781c95dda8a.tar.gz rails-a73adfa5f5d244c3f4292e521efd5781c95dda8a.tar.bz2 rails-a73adfa5f5d244c3f4292e521efd5781c95dda8a.zip | |
do not set Action Cable's config when specify `--skip-action-cable` option
Also remove duplicated `config.action_cable.url` config.
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 7 | 
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 | 
