Mobrovac has submitted this change and it was merged. Change subject: Update restbase to a86f966 ......................................................................
Update restbase to a86f966 List of changes: eda6d87 Disable pregeneration for non-main namespaces 637e61a Don't redirect POST requests 438f3c9 Explicitly prohibit caching for POSTs xxxxxxx Update node module dependencies Change-Id: Ie4d879ed8c4150bc30ccd3667b86cf922a9fd918 --- M node_modules/content-type/package.json M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json M node_modules/hyperswitch/node_modules/swagger-ui/package.json M node_modules/json-stable-stringify/package.json M node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json M node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json M node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json M node_modules/mediawiki-title/lib/index.js M node_modules/mediawiki-title/package.json M node_modules/mediawiki-title/test/index.js M node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json M node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json M node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/core-util-is/package.json M node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json M node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/isarray/package.json M restbase 16 files changed, 40 insertions(+), 38 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/node_modules/content-type/package.json b/node_modules/content-type/package.json index 3391a49..126f189 100644 --- a/node_modules/content-type/package.json +++ b/node_modules/content-type/package.json @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/jshttp/content-type#readme";, "_id": "[email protected]", - "_shasum": "7b0b9f223962f93a48fc8cf04c57e84588944882", + "_shasum": "d5be08a3d70439d7d80773d8a4b45014703b3b5b", "_from": "git+https://github.com/wikimedia/content-type.git#master";, "_resolved": "git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b"; } diff --git a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json index 9c8c480..3a8ec0e 100644 --- a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json +++ b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json @@ -50,7 +50,7 @@ "url": "https://github.com/substack/json-stable-stringify/issues"; }, "_id": "[email protected]", - "_shasum": "8e005700d866cce487fad51c035ee03e40aa4655", + "_shasum": "84f39ec2abbca0325e4ced436847cb48a3b0b876", "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master";, "_resolved": "git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f"; } diff --git a/node_modules/hyperswitch/node_modules/swagger-ui/package.json b/node_modules/hyperswitch/node_modules/swagger-ui/package.json index 8a37a6f..72aa54a 100644 --- a/node_modules/hyperswitch/node_modules/swagger-ui/package.json +++ b/node_modules/hyperswitch/node_modules/swagger-ui/package.json @@ -60,7 +60,7 @@ "url": "https://github.com/swagger-api/swagger-ui/issues"; }, "_id": "[email protected]", - "_shasum": "b4dbb4848e8ecde64e15de6bd9ecef0230b13948", + "_shasum": "52877aa10bb1f4241d4f6c30bc3971d0f13f4b6a", "_from": "git+https://github.com/wikimedia/swagger-ui.git#master";, "_resolved": "git+https://github.com/wikimedia/swagger-ui.git#7bef30a93a3b81c55cb95d3ce9e0f9f53d5d8262"; } diff --git a/node_modules/json-stable-stringify/package.json b/node_modules/json-stable-stringify/package.json index e21d4a8..ef0c7f1 100644 --- a/node_modules/json-stable-stringify/package.json +++ b/node_modules/json-stable-stringify/package.json @@ -50,7 +50,7 @@ "url": "https://github.com/substack/json-stable-stringify/issues"; }, "_id": "[email protected]", - "_shasum": "71a0d504301d1f50c307a17c4a81053305f95e7c", + "_shasum": "0589e6fa9d9649cce596cd7b007cf25d7ebe406b", "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master";, "_resolved": "git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f"; } diff --git a/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json index 0d9cbea..ddd227e 100644 --- a/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json +++ b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json @@ -55,5 +55,6 @@ } ], "directories": {}, - "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json index 85aec01..19228ab 100644 --- a/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json +++ b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/isarray/package.json @@ -45,5 +45,9 @@ ], "directories": {}, "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf", - "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";, + "bugs": { + "url": "https://github.com/juliangruber/isarray/issues"; + }, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json index 21c9cd5..0364d54 100644 --- a/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json +++ b/node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json @@ -49,5 +49,6 @@ "tarball": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/mediawiki-title/lib/index.js b/node_modules/mediawiki-title/lib/index.js index fb834e5..fb7d606 100644 --- a/node_modules/mediawiki-title/lib/index.js +++ b/node_modules/mediawiki-title/lib/index.js @@ -313,10 +313,10 @@ var fragmentIndex = result.title.indexOf('#'); if (fragmentIndex >= 0) { var fragment = result.title.substr(fragmentIndex); - result.fragment = fragment.substr(1).replace(/_/g, ' '); + result.fragment = fragment.substr(1).replace(/ /g, '_'); result.title = result.title - .substring(result.title, result.title.length - fragment.length) - .replace('/_*$/', ''); + .substring(0, result.title.length - fragment.length) + .replace('/_*$/', ''); } _checkLegalTitleCharacters(result.title, siteInfo); @@ -340,7 +340,7 @@ result.title = sanitizeIP(result.title); } - return new Title(result.title, result.namespace, siteInfo); + return new Title(result.title, result.namespace, siteInfo, result.fragment); }; /** @@ -355,7 +355,7 @@ } if (this._fragment) { - normalized = normalized + '#' + this._fragment; + normalized = normalized + '#' + this._fragment.replace(/ /g, '_'); } return normalized; }; diff --git a/node_modules/mediawiki-title/package.json b/node_modules/mediawiki-title/package.json index c176b98..f0498a0 100644 --- a/node_modules/mediawiki-title/package.json +++ b/node_modules/mediawiki-title/package.json @@ -1,6 +1,6 @@ { "name": "mediawiki-title", - "version": "0.3.0", + "version": "0.3.1", "description": "Title normalization library for mediawiki", "main": "lib/index.js", "scripts": { @@ -35,20 +35,16 @@ "mocha-lcov-reporter": "^1.0.0", "preq": "^0.4.8" }, - "gitHead": "dfdf26625f2a99d6896417871d817415b920a92a", + "gitHead": "217d530a153e9de4e1e9d58ae2e6ca7e2676faa1", "homepage": "https://github.com/wikimedia/mediawiki-title#readme";, - "_id": "[email protected]", - "_shasum": "e0d8a37ac724210765badff3e3a6107c38341657", + "_id": "[email protected]", + "_shasum": "0cb05674e28afa922fcd514e220c0df2f29546c1", "_from": "mediawiki-title@>=0.3.0 <0.4.0", "_npmVersion": "2.14.12", "_nodeVersion": "4.3.0", "_npmUser": { - "name": "pchelolo", - "email": "[email protected]" - }, - "dist": { - "shasum": "e0d8a37ac724210765badff3e3a6107c38341657", - "tarball": "http://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.3.0.tgz"; + "name": "doorman", + "email": "[email protected]" }, "maintainers": [ { @@ -68,10 +64,14 @@ "email": "[email protected]" } ], + "dist": { + "shasum": "0cb05674e28afa922fcd514e220c0df2f29546c1", + "tarball": "http://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.3.1.tgz"; + }, "_npmOperationalInternal": { - "host": "packages-13-west.internal.npmjs.com", - "tmp": "tmp/mediawiki-title-0.3.0.tgz_1457479972204_0.12909787171520293" + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/mediawiki-title-0.3.1.tgz_1457633515102_0.9660609429702163" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.3.0.tgz"; + "_resolved": "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.3.1.tgz"; } diff --git a/node_modules/mediawiki-title/test/index.js b/node_modules/mediawiki-title/test/index.js index 5264696..be9f694 100644 --- a/node_modules/mediawiki-title/test/index.js +++ b/node_modules/mediawiki-title/test/index.js @@ -187,6 +187,9 @@ [ 'en.wikipedia.org', 'User_talk:::1/24', 'User_talk:0:0:0:0:0:0:0:1/24'], // Case-sensitive namespace [ 'en.wikipedia.org', 'user:pchelolo', 'User:Pchelolo'], + [ 'en.wikipedia.org', + 'list of Neighbours characters (2016)#Tom Quill', + 'List_of_Neighbours_characters_(2016)#Tom_Quill'] ]; diff --git a/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json b/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json index 9c8c480..3a8ec0e 100644 --- a/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json +++ b/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json @@ -50,7 +50,7 @@ "url": "https://github.com/substack/json-stable-stringify/issues"; }, "_id": "[email protected]", - "_shasum": "8e005700d866cce487fad51c035ee03e40aa4655", + "_shasum": "84f39ec2abbca0325e4ced436847cb48a3b0b876", "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master";, "_resolved": "git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f"; } 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 cd6ba7a..75d2f9f 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": "85101f653f2eba5a5b4b6baa1a9ff8aa9957e61c", + "_shasum": "abe16fe7ab6f21793898492a61c22d46961aae60", "_from": "git+https://github.com/gwicke/kad.git#master";, "_resolved": "git+https://github.com/gwicke/kad.git#31449a27a289b6f0ecbeec193d8bac9db8b9f513"; } diff --git a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/core-util-is/package.json b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/core-util-is/package.json index ddd227e..0d9cbea 100644 --- a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/core-util-is/package.json +++ b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/core-util-is/package.json @@ -55,6 +55,5 @@ } ], "directories": {}, - "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";, - "readme": "ERROR: No README data found!" + "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; } diff --git a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json index 93d5078..b36fb3c 100644 --- a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json +++ b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json @@ -16,7 +16,7 @@ "browser": "./inherits_browser.js", "repository": { "type": "git", - "url": "git://github.com/isaacs/inherits.git" + "url": "git://github.com/isaacs/inherits" }, "license": "ISC", "scripts": { @@ -44,7 +44,5 @@ ], "directories": {}, "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1", - "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";, - "readme": "ERROR: No README data found!", - "homepage": "https://github.com/isaacs/inherits#readme"; + "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; } diff --git a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/isarray/package.json b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/isarray/package.json index 19228ab..85aec01 100644 --- a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/isarray/package.json +++ b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/isarray/package.json @@ -45,9 +45,5 @@ ], "directories": {}, "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf", - "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";, - "bugs": { - "url": "https://github.com/juliangruber/isarray/issues"; - }, - "readme": "ERROR: No README data found!" + "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; } diff --git a/restbase b/restbase index 6c0a362..a86f966 160000 --- a/restbase +++ b/restbase -Subproject commit 6c0a362ec7517d7456731fe73e43844aff8a3fba +Subproject commit a86f966b19bade4e1754d5327fe7170446305c34 -- To view, visit https://gerrit.wikimedia.org/r/276720 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie4d879ed8c4150bc30ccd3667b86cf922a9fd918 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac <[email protected]> Gerrit-Reviewer: Eevans <[email protected]> Gerrit-Reviewer: GWicke <[email protected]> Gerrit-Reviewer: Mobrovac <[email protected]> Gerrit-Reviewer: Ppchelko <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
