Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-26 06:28:23 +06:30
parent c65c466399 1f6a0eb1f6
commit 69f24101f9
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0'
 gem 'mysql2', '>= 0.3.18', '< 0.5'

 #Use PosgreSQL
-gem 'pg'
+#gem 'pg'

 # redis server for cable
 # gem 'redis', '~> 3.0'
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -168,7 +168,7 @@ end
                                                          'Content-Type' => 'application/json',
                                                          'Accept'       => 'application/json'
                                                  },
-                                                  :timeout 10
+                                                  :timeout => 10
                                            )
            rescue Net::OpenTimeout
              response = { status: false }