Merge branch 'master' into adminbsb_material_ui_test

2017-09-28 18:25:44 +06:30
parent 8d48a73cfc 8f0789fede
commit 343a61a7e3
20 changed files with 957 additions and 119 deletions
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -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