Mobrovac has submitted this change and it was merged.
Change subject: Update restbase to 061fe8d
......................................................................
Update restbase to 061fe8d
List of changes:
ca743a6 Pageviews: Use DTCS for the article flat column family
xxxxxxx Update node module dependencies
Change-Id: I8872ba91af8026499345ffe9263866e0975d1532
---
M node_modules/heapdump/build/config.gypi
M
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js
M
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
M
node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
M src
5 files changed, 35 insertions(+), 30 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/node_modules/heapdump/build/config.gypi
b/node_modules/heapdump/build/config.gypi
index d453c3b..4490995 100644
--- a/node_modules/heapdump/build/config.gypi
+++ b/node_modules/heapdump/build/config.gypi
@@ -109,7 +109,7 @@
"globalignorefile": "/etc/npmignore",
"cache_lock_retries": "10",
"save_prefix": "^",
- "group": "1001",
+ "group": "1000",
"init_author_email": "",
"searchexclude": "",
"git": "git",
diff --git
a/node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js
b/node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js
index 7820e64..f24db9b 100644
---
a/node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js
+++
b/node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/index.js
@@ -190,7 +190,7 @@
validate('for (var %s = %d; %s < %s.length; %s++) {', i,
node.items.length, i, name, i)
visit(name+'['+i+']', node.additionalItems, reporter, filter)
validate('}')
- }
+ }
}
if (node.format && fmts[node.format]) {
@@ -395,7 +395,7 @@
node.anyOf.forEach(function(sch, i) {
if (i === 0) {
validate('var %s = errors', prev)
- } else {
+ } else {
validate('if (errors !== %s) {', prev)
('errors = %s', prev)
}
@@ -446,7 +446,7 @@
if (node.maxProperties !== undefined) {
if (type !== 'object') validate('if (%s) {', types.object(name))
-
+
validate('if (Object.keys(%s).length > %d) {', name, node.maxProperties)
error('has more properties than allowed')
validate('}')
@@ -456,7 +456,7 @@
if (node.minProperties !== undefined) {
if (type !== 'object') validate('if (%s) {', types.object(name))
-
+
validate('if (Object.keys(%s).length < %d) {', name, node.minProperties)
error('has less properties than allowed')
validate('}')
@@ -466,7 +466,7 @@
if (node.maxItems !== undefined) {
if (type !== 'array') validate('if (%s) {', types.array(name))
-
+
validate('if (%s.length > %d) {', name, node.maxItems)
error('has more items than allowed')
validate('}')
@@ -476,7 +476,7 @@
if (node.minItems !== undefined) {
if (type !== 'array') validate('if (%s) {', types.array(name))
-
+
validate('if (%s.length < %d) {', name, node.minItems)
error('has less items than allowed')
validate('}')
@@ -543,14 +543,16 @@
validate = validate.toFunction(scope)
validate.errors = null
- validate.__defineGetter__('error', function() {
- if (!validate.errors) return ''
- return validate.errors
- .map(function(err) {
- return err.field+' '+err.message
- })
- .join('\n')
- })
+ if (Object.defineProperty) {
+ Object.defineProperty(validate, 'error', {
+ get: function() {
+ if (!validate.errors) return ''
+ return validate.errors.map(function(err) {
+ return err.field + ' ' + err.message;
+ }).join('\n')
+ }
+ })
+ }
validate.toJSON = function() {
return schema
diff --git
a/node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
b/node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
index a9ea095..8bac938 100644
---
a/node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
+++
b/node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
@@ -1,6 +1,6 @@
{
"name": "is-my-json-valid",
- "version": "2.12.2",
+ "version": "2.12.3",
"description": "A JSONSchema validator that uses code generation to be
extremely fast",
"main": "index.js",
"dependencies": {
@@ -17,7 +17,7 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/mafintosh/is-my-json-valid.git";
+ "url": "https://github.com/mafintosh/is-my-json-valid";
},
"keywords": [
"json",
@@ -33,21 +33,25 @@
"url": "https://github.com/mafintosh/is-my-json-valid/issues";
},
"homepage": "https://github.com/mafintosh/is-my-json-valid";,
- "gitHead": "48040cf001f661bcaa31f09bdc7fe3939ac2253b",
- "_id": "[email protected]",
- "_shasum": "0d65859318c846ce3a134402fd3fbc504272ccc9",
+ "gitHead": "822c5815f7ae4c50ed0c71451cb4dc3ea177be14",
+ "_id": "[email protected]",
+ "_shasum": "5a39d1d76b2dbb83140bbd157b1d5ee4bdc85ad6",
"_from": "is-my-json-valid@^2.12.2",
- "_npmVersion": "2.13.4",
- "_nodeVersion": "2.5.0",
+ "_npmVersion": "2.14.4",
+ "_nodeVersion": "4.1.1",
"_npmUser": {
"name": "mafintosh",
"email": "[email protected]"
},
"dist": {
- "shasum": "0d65859318c846ce3a134402fd3fbc504272ccc9",
- "tarball":
"http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz";
+ "shasum": "5a39d1d76b2dbb83140bbd157b1d5ee4bdc85ad6",
+ "tarball":
"http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz";
},
"maintainers": [
+ {
+ "name": "freeall",
+ "email": "[email protected]"
+ },
{
"name": "mafintosh",
"email": "[email protected]"
@@ -57,10 +61,10 @@
"email": "[email protected]"
},
{
- "name": "freeall",
- "email": "[email protected]"
+ "name": "yoshuawuyts",
+ "email": "[email protected]"
}
],
"directories": {},
- "_resolved":
"https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz";
+ "_resolved":
"https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz";
}
diff --git
a/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
b/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
index 37f1cb0..34c2887 100644
---
a/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
+++
b/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
@@ -57,7 +57,7 @@
"homepage": "https://github.com/caolan/async#readme";,
"_id": "[email protected]",
"_shasum": "aea74d5e61c1f899613bf64bda66d4c78f2fd17d",
- "_from": "async@~0.9.0",
+ "_from": "async@^0.9.0",
"_npmVersion": "2.9.0",
"_nodeVersion": "2.0.1",
"_npmUser": {
@@ -79,6 +79,5 @@
"tarball": "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz";,
- "readme": "ERROR: No README data found!"
+ "_resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
}
diff --git a/src b/src
index 7fde654..061fe8d 160000
--- a/src
+++ b/src
-Subproject commit 7fde654e6ce103de92e0aa5621d1c76549f9d752
+Subproject commit 061fe8d81c8e2ed72620f79487d94591de2cb8e8
--
To view, visit https://gerrit.wikimedia.org/r/251514
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8872ba91af8026499345ffe9263866e0975d1532
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/aqs/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Joal <[email protected]>
Gerrit-Reviewer: Milimetric <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
