aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2016-03-03 21:12:27 -0700
committerJeremy Daer <jeremydaer@gmail.com>2016-03-03 21:12:27 -0700
commit2cafbd311fe4ddcaf02cc838088ca24cffe80ceb (patch)
tree113c57b3fc35cd0c325e291bdcefb782d00bad23 /actioncable/lib
parentf8ec3a142fbfc9c6d6ddeb9ae75fd571343dcb40 (diff)
parent3e4ecbe8e6afda1f96e1e474189a09aa8d19a0a7 (diff)
downloadrails-2cafbd311fe4ddcaf02cc838088ca24cffe80ceb.tar.gz
rails-2cafbd311fe4ddcaf02cc838088ca24cffe80ceb.tar.bz2
rails-2cafbd311fe4ddcaf02cc838088ca24cffe80ceb.zip
Merge pull request #24039 from javan/actioncable-cleanup
Action Cable: client side 💅
Diffstat (limited to 'actioncable/lib')
-rw-r--r--actioncable/lib/action_cable.rb3
-rw-r--r--actioncable/lib/action_cable/engine.rb2
2 files changed, 3 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable.rb b/actioncable/lib/action_cable.rb
index a8e4d1cb25..68a5fff3e7 100644
--- a/actioncable/lib/action_cable.rb
+++ b/actioncable/lib/action_cable.rb
@@ -34,7 +34,8 @@ module ActionCable
ping: 'ping'.freeze,
confirmation: 'confirm_subscription'.freeze,
rejection: 'reject_subscription'.freeze
- }
+ },
+ default_mount_path: '/cable'.freeze
}
# Singleton instance of the server
diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb
index c90aadaf2c..7dc541d00c 100644
--- a/actioncable/lib/action_cable/engine.rb
+++ b/actioncable/lib/action_cable/engine.rb
@@ -6,7 +6,7 @@ require "active_support/core_ext/hash/indifferent_access"
module ActionCable
class Railtie < Rails::Engine # :nodoc:
config.action_cable = ActiveSupport::OrderedOptions.new
- config.action_cable.mount_path = '/cable'
+ config.action_cable.mount_path = ActionCable::INTERNAL[:default_mount_path]
config.eager_load_namespaces << ActionCable