diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-17 11:25:05 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-17 11:25:05 +0100 |
| commit | 7cf856e91fed0e1149bb305f226afc77ec496ffc (patch) | |
| tree | f640ecd490ae931cd4f3603e98408a057427a7a3 /railties | |
| parent | 457f92e824758abe574f906d1437aa6dd8139b79 (diff) | |
| download | rails-7cf856e91fed0e1149bb305f226afc77ec496ffc.tar.gz rails-7cf856e91fed0e1149bb305f226afc77ec496ffc.tar.bz2 rails-7cf856e91fed0e1149bb305f226afc77ec496ffc.zip | |
Don't mount the ActionCable server by default
Since we require you to enable it on the client-side, let us do the
same on the server-side. Then you’re not running an EventMachine unless
you need to.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/cable.coffee | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/routes.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/cable.coffee b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/cable.coffee index 4166ea02f1..cb7653cdc5 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/cable.coffee +++ b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/cable.coffee @@ -2,6 +2,6 @@ #= require_self #= require_tree ./channels -# Turn on the cable connection by removing the comments from the statements below: +# Turn on the cable connection (ensure it's also on in config/routes.rb): # @App ||= {} # App.cable = ActionCable.createConsumer() diff --git a/railties/lib/rails/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb index 3dfd415645..8293c8a483 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/routes.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb @@ -2,5 +2,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html # Serve websocket cable requests in-process - mount ActionCable.server => '/cable' + # mount ActionCable.server => '/cable' end |