Get ready to merge into Rails

62 files changed, 0 insertions, 0 deletions

diff --git a/Gemfile b/actioncable/Gemfile
index d2eaf07c80..d2eaf07c80 100644
--- a/Gemfile
+++ b/actioncable/Gemfile
diff --git a/Gemfile.lock b/actioncable/Gemfile.lock
index 3b67b1f67d..3b67b1f67d 100644
--- a/Gemfile.lock
+++ b/actioncable/Gemfile.lock
diff --git a/LICENSE b/actioncable/LICENSE
index a4910677eb..a4910677eb 100644
--- a/LICENSE
+++ b/actioncable/LICENSE
diff --git a/README.md b/actioncable/README.md
index 6511126896..6511126896 100644
--- a/README.md
+++ b/actioncable/README.md
diff --git a/Rakefile b/actioncable/Rakefile
index 69c95468e9..69c95468e9 100644
--- a/Rakefile
+++ b/actioncable/Rakefile
diff --git a/actioncable.gemspec b/actioncable/actioncable.gemspec
index 2f4ae41dc1..2f4ae41dc1 100644
--- a/actioncable.gemspec
+++ b/actioncable/actioncable.gemspec
diff --git a/lib/action_cable.rb b/actioncable/lib/action_cable.rb
index 3919812161..3919812161 100644
--- a/lib/action_cable.rb
+++ b/actioncable/lib/action_cable.rb
diff --git a/lib/action_cable/channel.rb b/actioncable/lib/action_cable/channel.rb
index 7ae262ce5f..7ae262ce5f 100644
--- a/lib/action_cable/channel.rb
+++ b/actioncable/lib/action_cable/channel.rb
diff --git a/lib/action_cable/channel/base.rb b/actioncable/lib/action_cable/channel/base.rb
index ca903a810d..ca903a810d 100644
--- a/lib/action_cable/channel/base.rb
+++ b/actioncable/lib/action_cable/channel/base.rb
diff --git a/lib/action_cable/channel/broadcasting.rb b/actioncable/lib/action_cable/channel/broadcasting.rb
index afc23d7d1a..afc23d7d1a 100644
--- a/lib/action_cable/channel/broadcasting.rb
+++ b/actioncable/lib/action_cable/channel/broadcasting.rb
diff --git a/lib/action_cable/channel/callbacks.rb b/actioncable/lib/action_cable/channel/callbacks.rb
index 295d750e86..295d750e86 100644
--- a/lib/action_cable/channel/callbacks.rb
+++ b/actioncable/lib/action_cable/channel/callbacks.rb
diff --git a/lib/action_cable/channel/naming.rb b/actioncable/lib/action_cable/channel/naming.rb
index 4c9d53b15a..4c9d53b15a 100644
--- a/lib/action_cable/channel/naming.rb
+++ b/actioncable/lib/action_cable/channel/naming.rb
diff --git a/lib/action_cable/channel/periodic_timers.rb b/actioncable/lib/action_cable/channel/periodic_timers.rb
index 25fe8e5e54..25fe8e5e54 100644
--- a/lib/action_cable/channel/periodic_timers.rb
+++ b/actioncable/lib/action_cable/channel/periodic_timers.rb
diff --git a/lib/action_cable/channel/streams.rb b/actioncable/lib/action_cable/channel/streams.rb
index b5ffa17f72..b5ffa17f72 100644
--- a/lib/action_cable/channel/streams.rb
+++ b/actioncable/lib/action_cable/channel/streams.rb
diff --git a/lib/action_cable/connection.rb b/actioncable/lib/action_cable/connection.rb
index b672e00682..b672e00682 100644
--- a/lib/action_cable/connection.rb
+++ b/actioncable/lib/action_cable/connection.rb
diff --git a/lib/action_cable/connection/authorization.rb b/actioncable/lib/action_cable/connection/authorization.rb
index 070a70e4e2..070a70e4e2 100644
--- a/lib/action_cable/connection/authorization.rb
+++ b/actioncable/lib/action_cable/connection/authorization.rb
diff --git a/lib/action_cable/connection/base.rb b/actioncable/lib/action_cable/connection/base.rb
index 7e9eec7508..7e9eec7508 100644
--- a/lib/action_cable/connection/base.rb
+++ b/actioncable/lib/action_cable/connection/base.rb
diff --git a/lib/action_cable/connection/identification.rb b/actioncable/lib/action_cable/connection/identification.rb
index 2d75ff8d6d..2d75ff8d6d 100644
--- a/lib/action_cable/connection/identification.rb
+++ b/actioncable/lib/action_cable/connection/identification.rb
diff --git a/lib/action_cable/connection/internal_channel.rb b/actioncable/lib/action_cable/connection/internal_channel.rb
index c065a24ab7..c065a24ab7 100644
--- a/lib/action_cable/connection/internal_channel.rb
+++ b/actioncable/lib/action_cable/connection/internal_channel.rb
diff --git a/lib/action_cable/connection/message_buffer.rb b/actioncable/lib/action_cable/connection/message_buffer.rb
index 25cff75b41..25cff75b41 100644
--- a/lib/action_cable/connection/message_buffer.rb
+++ b/actioncable/lib/action_cable/connection/message_buffer.rb
diff --git a/lib/action_cable/connection/subscriptions.rb b/actioncable/lib/action_cable/connection/subscriptions.rb
index 6199db4898..6199db4898 100644
--- a/lib/action_cable/connection/subscriptions.rb
+++ b/actioncable/lib/action_cable/connection/subscriptions.rb
diff --git a/lib/action_cable/connection/tagged_logger_proxy.rb b/actioncable/lib/action_cable/connection/tagged_logger_proxy.rb
index e5319087fb..e5319087fb 100644
--- a/lib/action_cable/connection/tagged_logger_proxy.rb
+++ b/actioncable/lib/action_cable/connection/tagged_logger_proxy.rb
diff --git a/lib/action_cable/connection/web_socket.rb b/actioncable/lib/action_cable/connection/web_socket.rb
index 169b683b8c..169b683b8c 100644
--- a/lib/action_cable/connection/web_socket.rb
+++ b/actioncable/lib/action_cable/connection/web_socket.rb
diff --git a/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb
index 4777c3886b..4777c3886b 100644
--- a/lib/action_cable/engine.rb
+++ b/actioncable/lib/action_cable/engine.rb
diff --git a/lib/action_cable/helpers/action_cable_helper.rb b/actioncable/lib/action_cable/helpers/action_cable_helper.rb
index b82751468a..b82751468a 100644
--- a/lib/action_cable/helpers/action_cable_helper.rb
+++ b/actioncable/lib/action_cable/helpers/action_cable_helper.rb
diff --git a/lib/action_cable/process/logging.rb b/actioncable/lib/action_cable/process/logging.rb
index 618ba7357a..618ba7357a 100644
--- a/lib/action_cable/process/logging.rb
+++ b/actioncable/lib/action_cable/process/logging.rb
diff --git a/lib/action_cable/remote_connections.rb b/actioncable/lib/action_cable/remote_connections.rb
index 1230d905ad..1230d905ad 100644
--- a/lib/action_cable/remote_connections.rb
+++ b/actioncable/lib/action_cable/remote_connections.rb
diff --git a/lib/action_cable/server.rb b/actioncable/lib/action_cable/server.rb
index a2a89d5f1e..a2a89d5f1e 100644
--- a/lib/action_cable/server.rb
+++ b/actioncable/lib/action_cable/server.rb
diff --git a/lib/action_cable/server/base.rb b/actioncable/lib/action_cable/server/base.rb
index f1585dc776..f1585dc776 100644
--- a/lib/action_cable/server/base.rb
+++ b/actioncable/lib/action_cable/server/base.rb
diff --git a/lib/action_cable/server/broadcasting.rb b/actioncable/lib/action_cable/server/broadcasting.rb
index 6e0fbae387..6e0fbae387 100644
--- a/lib/action_cable/server/broadcasting.rb
+++ b/actioncable/lib/action_cable/server/broadcasting.rb
diff --git a/lib/action_cable/server/configuration.rb b/actioncable/lib/action_cable/server/configuration.rb
index f7fcee019b..f7fcee019b 100644
--- a/lib/action_cable/server/configuration.rb
+++ b/actioncable/lib/action_cable/server/configuration.rb
diff --git a/lib/action_cable/server/connections.rb b/actioncable/lib/action_cable/server/connections.rb
index 47dcea8c20..47dcea8c20 100644
--- a/lib/action_cable/server/connections.rb
+++ b/actioncable/lib/action_cable/server/connections.rb
diff --git a/lib/action_cable/server/worker.rb b/actioncable/lib/action_cable/server/worker.rb
index e063b2a2e1..e063b2a2e1 100644
--- a/lib/action_cable/server/worker.rb
+++ b/actioncable/lib/action_cable/server/worker.rb
diff --git a/lib/action_cable/server/worker/active_record_connection_management.rb b/actioncable/lib/action_cable/server/worker/active_record_connection_management.rb
index ecece4e270..ecece4e270 100644
--- a/lib/action_cable/server/worker/active_record_connection_management.rb
+++ b/actioncable/lib/action_cable/server/worker/active_record_connection_management.rb
diff --git a/lib/action_cable/version.rb b/actioncable/lib/action_cable/version.rb
index 4947029dcc..4947029dcc 100644
--- a/lib/action_cable/version.rb
+++ b/actioncable/lib/action_cable/version.rb
diff --git a/lib/actioncable.rb b/actioncable/lib/actioncable.rb
index f6df6fd063..f6df6fd063 100644
--- a/lib/actioncable.rb
+++ b/actioncable/lib/actioncable.rb
diff --git a/lib/assets/javascripts/cable.coffee.erb b/actioncable/lib/assets/javascripts/cable.coffee.erb
index 25a9fc79c2..25a9fc79c2 100644
--- a/lib/assets/javascripts/cable.coffee.erb
+++ b/actioncable/lib/assets/javascripts/cable.coffee.erb
diff --git a/lib/assets/javascripts/cable/connection.coffee b/actioncable/lib/assets/javascripts/cable/connection.coffee
index b2abe8dcb2..b2abe8dcb2 100644
--- a/lib/assets/javascripts/cable/connection.coffee
+++ b/actioncable/lib/assets/javascripts/cable/connection.coffee
diff --git a/lib/assets/javascripts/cable/connection_monitor.coffee b/actioncable/lib/assets/javascripts/cable/connection_monitor.coffee
index 435efcc361..435efcc361 100644
--- a/lib/assets/javascripts/cable/connection_monitor.coffee
+++ b/actioncable/lib/assets/javascripts/cable/connection_monitor.coffee
diff --git a/lib/assets/javascripts/cable/consumer.coffee b/actioncable/lib/assets/javascripts/cable/consumer.coffee
index 05a7398e79..05a7398e79 100644
--- a/lib/assets/javascripts/cable/consumer.coffee
+++ b/actioncable/lib/assets/javascripts/cable/consumer.coffee
diff --git a/lib/assets/javascripts/cable/subscription.coffee b/actioncable/lib/assets/javascripts/cable/subscription.coffee
index 5b024d4e15..5b024d4e15 100644
--- a/lib/assets/javascripts/cable/subscription.coffee
+++ b/actioncable/lib/assets/javascripts/cable/subscription.coffee
diff --git a/lib/assets/javascripts/cable/subscriptions.coffee b/actioncable/lib/assets/javascripts/cable/subscriptions.coffee
index 7955565f06..7955565f06 100644
--- a/lib/assets/javascripts/cable/subscriptions.coffee
+++ b/actioncable/lib/assets/javascripts/cable/subscriptions.coffee
diff --git a/test/channel/base_test.rb b/actioncable/test/channel/base_test.rb
index 580338b44a..580338b44a 100644
--- a/test/channel/base_test.rb
+++ b/actioncable/test/channel/base_test.rb
diff --git a/test/channel/broadcasting_test.rb b/actioncable/test/channel/broadcasting_test.rb
index 1de04243e5..1de04243e5 100644
--- a/test/channel/broadcasting_test.rb
+++ b/actioncable/test/channel/broadcasting_test.rb
diff --git a/test/channel/naming_test.rb b/actioncable/test/channel/naming_test.rb
index 89ef6ad8b0..89ef6ad8b0 100644
--- a/test/channel/naming_test.rb
+++ b/actioncable/test/channel/naming_test.rb
diff --git a/test/channel/periodic_timers_test.rb b/actioncable/test/channel/periodic_timers_test.rb
index 1590a12f09..1590a12f09 100644
--- a/test/channel/periodic_timers_test.rb
+++ b/actioncable/test/channel/periodic_timers_test.rb
diff --git a/test/channel/rejection_test.rb b/actioncable/test/channel/rejection_test.rb
index aa93396d44..aa93396d44 100644
--- a/test/channel/rejection_test.rb
+++ b/actioncable/test/channel/rejection_test.rb
diff --git a/test/channel/stream_test.rb b/actioncable/test/channel/stream_test.rb
index 5e4e01abbf..5e4e01abbf 100644
--- a/test/channel/stream_test.rb
+++ b/actioncable/test/channel/stream_test.rb
diff --git a/test/connection/authorization_test.rb b/actioncable/test/connection/authorization_test.rb
index 68668b2835..68668b2835 100644
--- a/test/connection/authorization_test.rb
+++ b/actioncable/test/connection/authorization_test.rb
diff --git a/test/connection/base_test.rb b/actioncable/test/connection/base_test.rb
index da6041db4a..da6041db4a 100644
--- a/test/connection/base_test.rb
+++ b/actioncable/test/connection/base_test.rb
diff --git a/test/connection/cross_site_forgery_test.rb b/actioncable/test/connection/cross_site_forgery_test.rb
index ede3057e30..ede3057e30 100644
--- a/test/connection/cross_site_forgery_test.rb
+++ b/actioncable/test/connection/cross_site_forgery_test.rb
diff --git a/test/connection/identifier_test.rb b/actioncable/test/connection/identifier_test.rb
index 02e6b21845..02e6b21845 100644
--- a/test/connection/identifier_test.rb
+++ b/actioncable/test/connection/identifier_test.rb
diff --git a/test/connection/multiple_identifiers_test.rb b/actioncable/test/connection/multiple_identifiers_test.rb
index 55a9f96cb3..55a9f96cb3 100644
--- a/test/connection/multiple_identifiers_test.rb
+++ b/actioncable/test/connection/multiple_identifiers_test.rb
diff --git a/test/connection/string_identifier_test.rb b/actioncable/test/connection/string_identifier_test.rb
index ab69df57b3..ab69df57b3 100644
--- a/test/connection/string_identifier_test.rb
+++ b/actioncable/test/connection/string_identifier_test.rb
diff --git a/test/connection/subscriptions_test.rb b/actioncable/test/connection/subscriptions_test.rb
index 4f6760827e..4f6760827e 100644
--- a/test/connection/subscriptions_test.rb
+++ b/actioncable/test/connection/subscriptions_test.rb
diff --git a/test/stubs/global_id.rb b/actioncable/test/stubs/global_id.rb
index 334f0d03e8..334f0d03e8 100644
--- a/test/stubs/global_id.rb
+++ b/actioncable/test/stubs/global_id.rb
diff --git a/test/stubs/room.rb b/actioncable/test/stubs/room.rb
index cd66a0b687..cd66a0b687 100644
--- a/test/stubs/room.rb
+++ b/actioncable/test/stubs/room.rb
diff --git a/test/stubs/test_connection.rb b/actioncable/test/stubs/test_connection.rb
index 384abc5e76..384abc5e76 100644
--- a/test/stubs/test_connection.rb
+++ b/actioncable/test/stubs/test_connection.rb
diff --git a/test/stubs/test_server.rb b/actioncable/test/stubs/test_server.rb
index f9168f9b78..f9168f9b78 100644
--- a/test/stubs/test_server.rb
+++ b/actioncable/test/stubs/test_server.rb
diff --git a/test/stubs/user.rb b/actioncable/test/stubs/user.rb
index a66b4f87d5..a66b4f87d5 100644
--- a/test/stubs/user.rb
+++ b/actioncable/test/stubs/user.rb
diff --git a/test/test_helper.rb b/actioncable/test/test_helper.rb
index 935e50e900..935e50e900 100644
--- a/test/test_helper.rb
+++ b/actioncable/test/test_helper.rb
diff --git a/test/worker_test.rb b/actioncable/test/worker_test.rb
index 69c4b6529d..69c4b6529d 100644
--- a/test/worker_test.rb
+++ b/actioncable/test/worker_test.rb