Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01

2018-05-14 17:05:23 +06:30
parent 6e5064cf9f 522ccae378
commit 185ba2eaed
25 changed files with 328 additions and 183 deletions
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -55,5 +55,5 @@ Rails.application.configure do
  config.file_watcher = ActiveSupport::EventedFileUpdateChecker

  # Set Cable URL
-   config.action_cable.url = "ws://192.168.1.196:3002/cable"
+   # config.action_cable.url = "ws://192.168.1.196:3002/cable"
 end