Merge branch 'staging' into staging

FarmBot · Nov 5, 2018 · 13cc396 · 13cc396
2 parents dd5723f + 88b4300
commit 13cc396
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "css-loader": "^1.0.1",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.6.0",
-    "farmbot": "^6.5.7",
+    "farmbot": "^6.5.8",
     "farmbot-toastr": "^1.0.3",
     "fastclick": "^1.0.6",
     "file-loader": "2.0.0",

diff --git a/spec/controllers/api/devices/devices_controller_sync_spec.rb b/spec/controllers/api/devices/devices_controller_sync_spec.rb
@@ -10,7 +10,7 @@
     EDGE_CASES = [:devices, # Singular resources
                   :fbos_configs,
                   :firmware_configs,]
-    FORMAT     = "%Y-%m-%d %H:%M:%S.%6N"
+    FORMAT     = "%Y-%m-%d %H:%M:%S.%5N"
     it 'provides timestamps of updates, plus current time' do
       sign_in user