diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2015-10-07 14:43:47 -0500 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2015-10-07 14:43:47 -0500 |
| commit | 8275cfb20fda9c89c5b8d7fc17f9f88822fc34d2 (patch) | |
| tree | 5b802413283e2f9222fbde50ef6483e1180f70d0 /lib | |
| parent | 04317173a02eb67c103364b5c8b5756ac61fac98 (diff) | |
| download | rails-8275cfb20fda9c89c5b8d7fc17f9f88822fc34d2.tar.gz rails-8275cfb20fda9c89c5b8d7fc17f9f88822fc34d2.tar.bz2 rails-8275cfb20fda9c89c5b8d7fc17f9f88822fc34d2.zip | |
Use Array() instead of Array.wrap
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action_cable.rb | 1 | ||||
| -rw-r--r-- | lib/action_cable/connection/base.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/action_cable.rb b/lib/action_cable.rb index 49f14b51bc..d2c5251634 100644 --- a/lib/action_cable.rb +++ b/lib/action_cable.rb @@ -8,7 +8,6 @@ require 'active_support' require 'active_support/json' require 'active_support/concern' require 'active_support/core_ext/hash/indifferent_access' -require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/module/delegation' require 'active_support/callbacks' diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb index a2ef99dff4..5bf7086b60 100644 --- a/lib/action_cable/connection/base.rb +++ b/lib/action_cable/connection/base.rb @@ -172,7 +172,7 @@ module ActionCable origin_host = URI.parse(env['HTTP_ORIGIN']).host allowed = if server.config.allowed_request_origins.present? - Array.wrap(server.config.allowed_request_origins).include? origin_host + Array(server.config.allowed_request_origins).include? origin_host else request.host == origin_host end |