Mholloway has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327299 )
Change subject: Update mobileapps to f5d9d86
......................................................................
Update mobileapps to f5d9d86
List of changes:
d9221a4 Quote the ETag being set and fix it up in some endpoints
452a2a3 Update: pick localized pic descriptions uniformly
ab6bf7e Reinstate manual blacklist
f402fc5 Add EN Donation Announcements
f76c589 Update announcement schema and add validation check
xxxxxxx Update node module dependencies
Change-Id: Icbd766bae0fe9257d821455ff4a59ff79deae23e
---
M node_modules/preq/.travis.yml
M node_modules/preq/index.js
D
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt
A
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/LICENSE
M
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.d.ts
M
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json
M node_modules/preq/package.json
M
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M src
9 files changed, 52 insertions(+), 33 deletions(-)
Approvals:
Mholloway: Verified; Looks good to me, approved
diff --git a/node_modules/preq/.travis.yml b/node_modules/preq/.travis.yml
index 98690db..eed34de 100644
--- a/node_modules/preq/.travis.yml
+++ b/node_modules/preq/.travis.yml
@@ -2,5 +2,9 @@
node_js:
- "0.10"
- "4"
+ # Test 5.6 / 5.7 as well, as the agent behavior changed between those
+ # versions.
+ - "5.6"
+ - "5.7"
- "6"
diff --git a/node_modules/preq/index.js b/node_modules/preq/index.js
index 0dc2de5..4792bdb 100644
--- a/node_modules/preq/index.js
+++ b/node_modules/preq/index.js
@@ -56,7 +56,7 @@
}
var agentOptions = {
- connectTimeout: 5 * 1000,
+ connectTimeout: (process.env.PREQ_CONNECT_TIMEOUT || 5) * 1000,
// Setting this too high (especially 'Infinity') leads to high
// (hundreds of mb) memory usage in the agent under sustained request
// workloads. 250 should be a reasonable upper bound for practical
diff --git
a/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt
b/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt
deleted file mode 100644
index c2bd1e5..0000000
---
a/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Public Domain
-
-The person who associated a work with this deed has dedicated the work to the
-public domain by waiving all of his or her rights to the work worldwide under
-copyright law, including all related and neighboring rights, to the extent
-allowed by law.
-
-You can copy, modify, distribute and perform the work, even for commercial
-purposes, all without asking permission.
diff --git
a/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/LICENSE
b/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/LICENSE
new file mode 100644
index 0000000..cf1ab25
--- /dev/null
+++
b/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/LICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org>
diff --git
a/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.d.ts
b/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.d.ts
index e83ec05..964e7dc 100644
---
a/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.d.ts
+++
b/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.d.ts
@@ -18,7 +18,7 @@
export interface secretbox {
(msg: Uint8Array, nonce: Uint8Array, key: Uint8Array): Uint8Array;
- open(box: Uint8Array, nonce: Uint8Array, key: Uint8Array): Uint8Array;
+ open(box: Uint8Array, nonce: Uint8Array, key: Uint8Array): Uint8Array
| false;
readonly keyLength: number;
readonly nonceLength: number;
readonly overheadLength: number;
@@ -33,8 +33,8 @@
namespace box {
export interface open {
- (msg: Uint8Array, nonce: Uint8Array, publicKey: Uint8Array,
secretKey: Uint8Array): Uint8Array;
- after(box: Uint8Array, nonce: Uint8Array, key: Uint8Array):
Uint8Array;
+ (msg: Uint8Array, nonce: Uint8Array, publicKey: Uint8Array,
secretKey: Uint8Array): Uint8Array | false;
+ after(box: Uint8Array, nonce: Uint8Array, key: Uint8Array):
Uint8Array | false;
}
export interface keyPair {
@@ -71,7 +71,7 @@
export interface sign {
(msg: Uint8Array, secretKey: Uint8Array): Uint8Array;
- open(signedMsg: Uint8Array, publicKey: Uint8Array): Uint8Array;
+ open(signedMsg: Uint8Array, publicKey: Uint8Array): Uint8Array | null;
detached: sign.detached;
keyPair: sign.keyPair;
readonly publicKeyLength: number;
diff --git
a/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json
b/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json
index a4aad47..df9ee65 100644
---
a/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json
+++
b/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json
@@ -1,6 +1,6 @@
{
"name": "tweetnacl",
- "version": "0.14.4",
+ "version": "0.14.5",
"description": "Port of TweetNaCl cryptographic library to JavaScript",
"main": "nacl-fast.js",
"types": "nacl.d.ts",
@@ -38,7 +38,7 @@
"author": {
"name": "TweetNaCl-js contributors"
},
- "license": "SEE LICENSE IN COPYING.txt",
+ "license": "Unlicense",
"bugs": {
"url": "https://github.com/dchest/tweetnacl-js/issues";
},
@@ -57,9 +57,9 @@
"buffer": false,
"crypto": false
},
- "gitHead": "53024cf517ead075666dd430295bd0992dd2a48d",
- "_id": "[email protected]",
- "_shasum": "8c9dbfb52795686f166cd2023794bcf103d13c2b",
+ "gitHead": "cce829e473b1ae299a9373b5140c713ee88f577f",
+ "_id": "[email protected]",
+ "_shasum": "5ae68177f192d4456269d108afa93ff8743f4f64",
"_from": "tweetnacl@>=0.14.0 <0.15.0",
"_npmVersion": "3.10.8",
"_nodeVersion": "7.0.0",
@@ -68,8 +68,8 @@
"email": "[email protected]"
},
"dist": {
- "shasum": "8c9dbfb52795686f166cd2023794bcf103d13c2b",
- "tarball": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.4.tgz";
+ "shasum": "5ae68177f192d4456269d108afa93ff8743f4f64",
+ "tarball": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
},
"maintainers": [
{
@@ -79,7 +79,7 @@
],
"_npmOperationalInternal": {
"host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/tweetnacl-0.14.4.tgz_1480702221977_0.6762865034397691"
+ "tmp": "tmp/tweetnacl-0.14.5.tgz_1481627515097_0.015130913350731134"
},
- "_resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.4.tgz";
+ "_resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
}
diff --git a/node_modules/preq/package.json b/node_modules/preq/package.json
index e26fce6..3f1bcd7 100644
--- a/node_modules/preq/package.json
+++ b/node_modules/preq/package.json
@@ -1,6 +1,6 @@
{
"name": "preq",
- "version": "0.5.0",
+ "version": "0.5.1",
"description": "Yet another promising request wrapper",
"main": "index.js",
"scripts": {
@@ -24,12 +24,12 @@
"url": "git://github.com/wikimedia/preq.git"
},
"homepage": "https://github.com/wikimedia/preq";,
- "gitHead": "8fd7fff75ba26191a102ccf2b8d12f45d7c6e5c2",
+ "gitHead": "a7a056dcdf2eb0d48a7f31b2e26b01ad5eb6fe4c",
"bugs": {
"url": "https://github.com/wikimedia/preq/issues";
},
- "_id": "[email protected]",
- "_shasum": "ae246305085fd077e2dd15668720c39f81ce8d46",
+ "_id": "[email protected]",
+ "_shasum": "b185d2bb6a1c38a9a13a8f669e44ecd65f362d35",
"_from": "preq@>=0.5.0 <0.6.0",
"_npmVersion": "1.4.21",
"_npmUser": {
@@ -51,13 +51,13 @@
}
],
"dist": {
- "shasum": "ae246305085fd077e2dd15668720c39f81ce8d46",
- "tarball": "https://registry.npmjs.org/preq/-/preq-0.5.0.tgz";
+ "shasum": "b185d2bb6a1c38a9a13a8f669e44ecd65f362d35",
+ "tarball": "https://registry.npmjs.org/preq/-/preq-0.5.1.tgz";
},
"_npmOperationalInternal": {
"host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/preq-0.5.0.tgz_1478878812100_0.4030860348138958"
+ "tmp": "tmp/preq-0.5.1.tgz_1481593463661_0.34232730604708195"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/preq/-/preq-0.5.0.tgz";
+ "_resolved": "https://registry.npmjs.org/preq/-/preq-0.5.1.tgz";
}
diff --git
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
index d3e480d..57c1562 100644
---
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
+++
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
@@ -75,7 +75,7 @@
},
"homepage": "https://github.com/kadtools/kad#readme";,
"_id": "[email protected]",
- "_shasum": "c83491493e50160dd3cd32dbb90799e6a1073325",
+ "_shasum": "97352460b7b851e20d0d38e2177146bc1aa21994",
"_from": "git+https://github.com/gwicke/kad.git#master";,
"_resolved":
"git+https://github.com/gwicke/kad.git#f35971036f43814043245da82b12d035b7bbfd16";
}
diff --git a/src b/src
index 2a8ad26..f5d9d86 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 2a8ad26212da4cd680670424a2bf0101b91e107c
+Subproject commit f5d9d8604851aeb0624272e1f864fb7b09a28f40
--
To view, visit https://gerrit.wikimedia.org/r/327299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbd766bae0fe9257d821455ff4a59ff79deae23e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
