pull origin master

This commit is contained in:
Yan
2017-09-18 13:53:28 +06:30
parent 4f3b831771
commit 8966f290b5
122 changed files with 3964 additions and 2277 deletions

View File

@@ -45,6 +45,8 @@ Rails.application.configure do
# Suppress logger output for asset requests.
config.assets.quiet = true
config.web_console.whiny_requests = false
# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true
@@ -53,5 +55,5 @@ Rails.application.configure do
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
# Set Cable URL
# config.action_cable.url = "ws://192.168.1.140:3002/cable"
config.action_cable.url = "ws://192.168.1.39:3002/cable"
end