Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/336233 )
Change subject: Update restbase to 6810c74 ...................................................................... Update restbase to 6810c74 List of changes: 94786cf Revert "Revert "Abstracted the common feed functionality"" 93c5fdc Added 'coordinates' property to the summary 2ef6ce7 Double-check the coords exist 6810c74 Blacklist: Add various pages xxxxxxx Update node module dependencies Change-Id: I9895010ebf9a5f4e11eddeb1bbdb5247034179be --- M node_modules/content-type/package.json M node_modules/hosted-git-info/git-host-info.js M node_modules/hosted-git-info/git-host.js M node_modules/hosted-git-info/package.json M node_modules/json-stable-stringify/package.json M node_modules/kad/package.json M node_modules/swagger-ui/package.json M restbase 8 files changed, 33 insertions(+), 37 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 036da47..bdd3c02 100644 --- a/node_modules/content-type/package.json +++ b/node_modules/content-type/package.json @@ -49,7 +49,7 @@ "/" ], "_resolved": "git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b", - "_shasum": "80d0649ab23cf810edc0d08f625b9270675e1c9f", + "_shasum": "0ff3391e4a5b77fc23e0a8471d0c0fc79170eda3", "_shrinkwrap": null, "_spec": "content-type@git+https://github.com/wikimedia/content-type.git#master", "_where": "/opt/service", diff --git a/node_modules/hosted-git-info/git-host-info.js b/node_modules/hosted-git-info/git-host-info.js index 2234333..cd511e3 100644 --- a/node_modules/hosted-git-info/git-host-info.js +++ b/node_modules/hosted-git-info/git-host-info.js @@ -9,19 +9,22 @@ 'treepath': 'tree', 'filetemplate': 'https://{auth@}raw.githubusercontent.com/{user}/{project}/{committish}/{path}', 'bugstemplate': 'https://{domain}/{user}/{project}/issues', - 'gittemplate': 'git://{auth@}{domain}/{user}/{project}.git{#committish}' + 'gittemplate': 'git://{auth@}{domain}/{user}/{project}.git{#committish}', + 'tarballtemplate': 'https://{domain}/{user}/{project}/archive/{committish}.tar.gz' }, bitbucket: { 'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ], 'domain': 'bitbucket.org', - 'treepath': 'src' + 'treepath': 'src', + 'tarballtemplate': 'https://{domain}/{user}/{project}/get/{committish}.tar.gz' }, gitlab: { 'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ], 'domain': 'gitlab.com', 'treepath': 'tree', 'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#README', - 'bugstemplate': 'https://{domain}/{user}/{project}/issues' + 'bugstemplate': 'https://{domain}/{user}/{project}/issues', + 'tarballtemplate': 'https://{domain}/{user}/{project}/repository/archive.tar.gz?ref={committish}' }, gist: { 'protocols': [ 'git', 'git+ssh', 'git+https', 'ssh', 'https' ], @@ -36,7 +39,8 @@ 'docstemplate': 'https://{domain}/{project}{/committish}', 'httpstemplate': 'git+https://{domain}/{project}.git{#committish}', 'shortcuttemplate': '{type}:{project}{#committish}', - 'pathtemplate': '{project}{#committish}' + 'pathtemplate': '{project}{#committish}', + 'tarballtemplate': 'https://{domain}/{user}/{project}/archive/{committish}.tar.gz' } } diff --git a/node_modules/hosted-git-info/git-host.js b/node_modules/hosted-git-info/git-host.js index ea31380..3ce4bc3 100644 --- a/node_modules/hosted-git-info/git-host.js +++ b/node_modules/hosted-git-info/git-host.js @@ -81,6 +81,10 @@ return this._fill(this.pathtemplate) } +GitHost.prototype.tarball = function () { + return this._fill(this.tarballtemplate) +} + GitHost.prototype.file = function (P) { return this._fill(this.filetemplate, { path: P.replace(/^[/]+/g, '') diff --git a/node_modules/hosted-git-info/package.json b/node_modules/hosted-git-info/package.json index 5519664..ebaef50 100644 --- a/node_modules/hosted-git-info/package.json +++ b/node_modules/hosted-git-info/package.json @@ -14,19 +14,19 @@ ] ], "_from": "hosted-git-info@>=2.1.4 <3.0.0", - "_id": "hosted-git-info@2.1.5", + "_id": "hosted-git-info@2.2.0", "_inCache": true, "_location": "/hosted-git-info", - "_nodeVersion": "5.10.1", + "_nodeVersion": "7.4.0", "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/hosted-git-info-2.1.5.tgz_1463518889246_0.20443619322031736" + "host": "packages-18-east.internal.npmjs.com", + "tmp": "tmp/hosted-git-info-2.2.0.tgz_1486365886030_0.0815314722713083" }, "_npmUser": { "name": "zkat", "email": "k...@sykosomatic.org" }, - "_npmVersion": "3.9.1", + "_npmVersion": "4.2.0", "_phantomChildren": {}, "_requested": { "raw": "hosted-git-info@^2.1.4", @@ -40,8 +40,8 @@ "_requiredBy": [ "/normalize-package-data" ], - "_resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz", - "_shasum": "0ba81d90da2e25ab34a332e6ec77936e1598118b", + "_resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz", + "_shasum": "7a0d097863d886c0fabbdcd37bf1758d8becf8a5", "_shrinkwrap": null, "_spec": "hosted-git-info@^2.1.4", "_where": "/opt/service/node_modules/normalize-package-data", @@ -57,14 +57,14 @@ "description": "Provides metadata and conversions from repository urls for Github, Bitbucket and Gitlab", "devDependencies": { "standard": "^3.3.2", - "tap": "^0.4.13" + "tap": "^10.0.2" }, "directories": {}, "dist": { - "shasum": "0ba81d90da2e25ab34a332e6ec77936e1598118b", - "tarball": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz" + "shasum": "7a0d097863d886c0fabbdcd37bf1758d8becf8a5", + "tarball": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz" }, - "gitHead": "4e6bb323a97a57c18e6b4b891527e26154d04fbe", + "gitHead": "d5ea6d1de852b04589f100c671fa0d3311f3449f", "homepage": "https://github.com/npm/hosted-git-info", "keywords": [ "git", @@ -96,7 +96,7 @@ "url": "git+https://github.com/npm/hosted-git-info.git" }, "scripts": { - "test": "standard && tap test/*.js" + "test": "standard && tap -j8 test/*.js" }, - "version": "2.1.5" + "version": "2.2.0" } diff --git a/node_modules/json-stable-stringify/package.json b/node_modules/json-stable-stringify/package.json index 05f3c5d..a13c65b 100644 --- a/node_modules/json-stable-stringify/package.json +++ b/node_modules/json-stable-stringify/package.json @@ -51,7 +51,7 @@ "/restbase-mod-table-cassandra" ], "_resolved": "git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f", - "_shasum": "ba88ede951dda64ec219e3ff5fff015f65d80491", + "_shasum": "55595ecb9c295565789ded04ff29e95932142da1", "_shrinkwrap": null, "_spec": "json-stable-stringify@git+https://github.com/wikimedia/json-stable-stringify.git#master", "_where": "/opt/service", diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json index 83f65f2..e61bb4c 100644 --- a/node_modules/kad/package.json +++ b/node_modules/kad/package.json @@ -48,8 +48,8 @@ "_requiredBy": [ "/limitation" ], - "_resolved": "git+https://github.com/gwicke/kad.git#f35971036f43814043245da82b12d035b7bbfd16", - "_shasum": "ab949140c8127290437a436a22a5a5fbd50809ce", + "_resolved": "git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17", + "_shasum": "8329f67a93bf1b971da434ad84cff0ef2a1b0cfb", "_shrinkwrap": null, "_spec": "kad@git+https://github.com/gwicke/kad.git#master", "_where": "/opt/service/node_modules/limitation", @@ -99,10 +99,7 @@ "doc": "doc", "example": "example" }, - "engines": { - "node": "4.x.x" - }, - "gitHead": "f35971036f43814043245da82b12d035b7bbfd16", + "gitHead": "936c91652d757ea6f9dd30e44698afb0daaa1d17", "homepage": "https://github.com/kadtools/kad#readme", "keywords": [ "dht", @@ -128,14 +125,5 @@ "test": "npm run testsuite && npm run linter", "testsuite": "mocha test/** --recursive" }, - "version": "1.3.6", - "warnings": [ - { - "code": "ENOTSUP", - "required": { - "node": "4.x.x" - }, - "pkgid": "kad@1.3.6" - } - ] + "version": "1.3.6" } diff --git a/node_modules/swagger-ui/package.json b/node_modules/swagger-ui/package.json index c121757..10137ed 100644 --- a/node_modules/swagger-ui/package.json +++ b/node_modules/swagger-ui/package.json @@ -49,7 +49,7 @@ "/hyperswitch" ], "_resolved": "git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541", - "_shasum": "3009ef75f0abe7bdffbb5e7af65f827d2c428783", + "_shasum": "64687cf377f5916d59c7da657db4f45a6064f515", "_shrinkwrap": null, "_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master", "_where": "/opt/service/node_modules/hyperswitch", diff --git a/restbase b/restbase index e628423..6810c74 160000 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit e628423b47745f8c5c4a5d2d2f6665731b1f616b +Subproject commit 6810c7414d2a34ec46a4c6af1ec56006885d55d4 -- To view, visit https://gerrit.wikimedia.org/r/336233 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9895010ebf9a5f4e11eddeb1bbdb5247034179be Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits