Merge branch 'master' into staging

This commit is contained in:
Yan
2017-10-09 10:58:10 +06:30

View File

@@ -84,4 +84,8 @@ Rails.application.configure do
# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false
# Action Cable Setup
config.action_cable.url = "ws://192.168.1.24:9292/cable"
config.action_cable.allowed_request_origins = [/http:\/\/*/, /https:\/\/*/]
end