diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-06-20 01:26:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-20 01:26:54 -0400 |
| commit | 994aeaa1dd72e0651da1c704bb8c44b552b10d35 (patch) | |
| tree | f430921093500f5a13a812cee2d4e997ca696e04 /actioncable/lib | |
| parent | 166e7f07c9888b1ea60a532d38704115cdde56e3 (diff) | |
| parent | 0a8584456e05e3dedccca3789a415080f9a43f80 (diff) | |
| download | rails-994aeaa1dd72e0651da1c704bb8c44b552b10d35.tar.gz rails-994aeaa1dd72e0651da1c704bb8c44b552b10d35.tar.bz2 rails-994aeaa1dd72e0651da1c704bb8c44b552b10d35.zip | |
Merge pull request #25420 from michaeldever/mdever_actioncable_development_ports
Allow actioncable connections from all ports in development
Diffstat (limited to 'actioncable/lib')
| -rw-r--r-- | actioncable/lib/action_cable/engine.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb index 96176e0014..34f9952c71 100644 --- a/actioncable/lib/action_cable/engine.rb +++ b/actioncable/lib/action_cable/engine.rb @@ -22,7 +22,7 @@ module ActionCable initializer "action_cable.set_configs" do |app| options = app.config.action_cable - options.allowed_request_origins ||= "http://localhost:3000" if ::Rails.env.development? + options.allowed_request_origins ||= /https?:\/\/localhost:\d+/ if ::Rails.env.development? app.paths.add "config/cable", with: "config/cable.yml" |