[pull] master from ipfs:master

CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="0.37.0-rc.1"></a>
+# [0.37.0-rc.1](https://github.com/ipfs/js-ipfs/compare/v0.37.0-rc.0...v0.37.0-rc.1) (2019-08-06)
+
+
+### Bug Fixes
+
+* add CORS headers to gateway responses ([#2254](https://github.com/ipfs/js-ipfs/issues/2254)) ([5156a47](https://github.com/ipfs/js-ipfs/commit/5156a47))
+* disable socket timeout for pubsub subscriptions ([#2303](https://github.com/ipfs/js-ipfs/issues/2303)) ([3583cc2](https://github.com/ipfs/js-ipfs/commit/3583cc2))
+* move mfs cmds and safer exit ([#1981](https://github.com/ipfs/js-ipfs/issues/1981)) ([fee0141](https://github.com/ipfs/js-ipfs/commit/fee0141))
+* swarm.peers latency value when unknown ([#2336](https://github.com/ipfs/js-ipfs/issues/2336)) ([6248ec1](https://github.com/ipfs/js-ipfs/commit/6248ec1))
+* use ephemeral ports in API/Gateway bind test ([#2305](https://github.com/ipfs/js-ipfs/issues/2305)) ([24679af](https://github.com/ipfs/js-ipfs/commit/24679af))
+* **package:** update ipfs-mfs to version 0.12.0 ([#2275](https://github.com/ipfs/js-ipfs/issues/2275)) ([c15f146](https://github.com/ipfs/js-ipfs/commit/c15f146))
+
+
+
 <a name="0.37.0-rc.0"></a>
 # [0.37.0-rc.0](https://github.com/ipfs/js-ipfs/compare/v0.36.4...v0.37.0-rc.0) (2019-07-17)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipfs",
-  "version": "0.37.0-rc.0",
+  "version": "0.37.0-rc.1",
   "description": "JavaScript implementation of the IPFS specification",
   "keywords": [
     "IPFS"
@@ -190,7 +190,7 @@
     "execa": "^2.0.3",
     "form-data": "^2.5.0",
     "hat": "0.0.3",
-    "interface-ipfs-core": "~0.107.3",
+    "interface-ipfs-core": "^0.109.1",
     "ipfsd-ctl": "^0.43.0",
     "libp2p-websocket-star": "~0.10.2",
     "ncp": "^2.0.0",
@@ -239,7 +239,7 @@
     "Diogo Silva <[email protected]>",
     "Dmitriy Ryajov <[email protected]>",
     "Dominic Della Valle <[email protected]>",
-    "Dzmitry Das <[email protected]>",
+    "Dzmitry Bachko <[email protected]>",
     "Enrico Marino <[email protected]>",
     "Faheel Ahmad <[email protected]>",
     "Felix Yan <[email protected]>",
@@ -282,6 +282,7 @@
     "Molly <[email protected]>",
     "Mounish Sai <[email protected]>",
     "My9Bot <[email protected]>",
+    "Nick Poulden <[email protected]>",
     "Nitin Patel <[email protected]>",
     "Nuno Nogueira <[email protected]>",
     "Oli Evans <[email protected]>",

src/core/components/swarm.js

@@ -34,7 +34,7 @@ module.exports = function swarm (self) {
           peer: peer.id
         }
         if (verbose) {
-          tupple.latency = 'unknown'
+          tupple.latency = 'n/a'
         }
 
         peers.push(tupple)

src/http/api/routes/webui.js

@@ -26,7 +26,7 @@ module.exports = [
     method: '*',
     path: '/webui',
     handler (request, h) {
-      return h.redirect('/ipfs/QmQNHd1suZTktPRhP7DD4nKWG46ZRSxkwHocycHVrK3dYW')
+      return h.redirect('/ipfs/QmNyMYhwJUS1cVvaWoVBhrW8KPj1qmie7rZcWo8f1Bvkhz')
     }
   }
 ]

test/core/interface.spec.js

@@ -17,10 +17,20 @@ describe('interface-ipfs-core tests', function () {
   tests.bootstrap(defaultCommonFactory)
 
   tests.config(defaultCommonFactory, {
-    skip: [{
-      name: 'should set a number',
-      reason: 'Failing - needs to be fixed'
-    }]
+    skip: [
+      {
+        name: 'should set a number',
+        reason: 'Failing - needs to be fixed'
+      },
+      {
+        name: 'should output changes but not save them for dry run',
+        reason: 'TODO unskip when https://github.com/ipfs/js-ipfs/pull/2165 is merged'
+      },
+      {
+        name: 'should set a config profile',
+        reason: 'TODO unskip when https://github.com/ipfs/js-ipfs/pull/2165 is merged'
+      }
+    ]
   })
 
   tests.dag(defaultCommonFactory)
@@ -119,7 +129,14 @@ describe('interface-ipfs-core tests', function () {
     }
   }))
 
-  tests.object(defaultCommonFactory)
+  tests.object(defaultCommonFactory, {
+    skip: [
+      {
+        name: 'should respect timeout option',
+        reason: 'js-ipfs doesn\'t support timeout yet'
+      }
+    ]
+  })
 
   tests.pin(defaultCommonFactory)
 

test/http-api/interface.js

@@ -17,10 +17,20 @@ describe('interface-ipfs-core over ipfs-http-client tests', () => {
   tests.bootstrap(defaultCommonFactory)
 
   tests.config(defaultCommonFactory, {
-    skip: [{
-      name: 'should set a number',
-      reason: 'Failing - needs to be fixed'
-    }]
+    skip: [
+      {
+        name: 'should set a number',
+        reason: 'Failing - needs to be fixed'
+      },
+      {
+        name: 'should output changes but not save them for dry run',
+        reason: 'TODO unskip when https://github.com/ipfs/js-ipfs/pull/2165 is merged'
+      },
+      {
+        name: 'should set a config profile',
+        reason: 'TODO unskip when https://github.com/ipfs/js-ipfs/pull/2165 is merged'
+      }
+    ]
   })
 
   tests.dag(defaultCommonFactory, {
@@ -122,7 +132,14 @@ describe('interface-ipfs-core over ipfs-http-client tests', () => {
     }
   }))
 
-  tests.object(defaultCommonFactory)
+  tests.object(defaultCommonFactory, {
+    skip: [
+      {
+        name: 'should respect timeout option',
+        reason: 'js-ipfs doesn\'t support timeout yet'
+      }
+    ]
+  })
 
   tests.pin(defaultCommonFactory)