[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to e628423
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/336232 ) Change subject: Update restbase to e628423 .. Update restbase to e628423 List of changes: xxx Update node module dependencies Change-Id: I507b00f9206a035701926c4df3c4621b785e3451 --- 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 7 files changed, 32 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/32/336232/1 diff --git a/node_modules/content-type/package.json b/node_modules/content-type/package.json index 036da47..d5c80ae 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": "b2ad2e6c047234607f46c0dd384cd814f0c1cd7f", "_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": "0ba81d9
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to e628423
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/335673 ) Change subject: Update restbase to e628423 .. Update restbase to e628423 List of changes: 9d1daff Stop using deprecated ServiceRunner.run() e628423 Revert "Abstracted the common feed functionality" xxx Update node module dependencies Change-Id: I1eb8cc3c75965b86921f1470efde1f842df89467 --- M node_modules/bcrypt-pbkdf/index.js M node_modules/bcrypt-pbkdf/package.json M node_modules/content-type/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 7 files changed, 30 insertions(+), 21 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/node_modules/bcrypt-pbkdf/index.js b/node_modules/bcrypt-pbkdf/index.js index ea29aa9..b1b5ad4 100644 --- a/node_modules/bcrypt-pbkdf/index.js +++ b/node_modules/bcrypt-pbkdf/index.js @@ -29,10 +29,7 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Niels Provos. - * 4. The name of the author may not be used to endorse or promote products + * 3. The name of the author may not be used to endorse or promote products *derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR diff --git a/node_modules/bcrypt-pbkdf/package.json b/node_modules/bcrypt-pbkdf/package.json index b5d6352..0157b70 100644 --- a/node_modules/bcrypt-pbkdf/package.json +++ b/node_modules/bcrypt-pbkdf/package.json @@ -14,19 +14,19 @@ ] ], "_from": "bcrypt-pbkdf@>=1.0.0 <2.0.0", - "_id": "bcrypt-pbkdf@1.0.0", + "_id": "bcrypt-pbkdf@1.0.1", "_inCache": true, "_location": "/bcrypt-pbkdf", - "_nodeVersion": "0.12.15", + "_nodeVersion": "0.12.9", "_npmOperationalInternal": { -"host": "packages-16-east.internal.npmjs.com", -"tmp": "tmp/bcrypt-pbkdf-1.0.0.tgz_1471381825814_0.06877309852279723" +"host": "packages-18-east.internal.npmjs.com", +"tmp": "tmp/bcrypt-pbkdf-1.0.1.tgz_1486007687899_0.974529881728813" }, "_npmUser": { "name": "arekinath", "email": "a...@cooperi.net" }, - "_npmVersion": "3.10.3", + "_npmVersion": "2.14.9", "_phantomChildren": {}, "_requested": { "raw": "bcrypt-pbkdf@^1.0.0", @@ -40,8 +40,8 @@ "_requiredBy": [ "/sshpk" ], - "_resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz";, - "_shasum": "3ca76b85241c7170bf7d9703e7b9aa74630040d4", + "_resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";, + "_shasum": "63bc5dcb61331b92bc05fd528953c33462a06f8d", "_shrinkwrap": null, "_spec": "bcrypt-pbkdf@^1.0.0", "_where": "/opt/service/node_modules/sshpk", @@ -52,21 +52,33 @@ "devDependencies": {}, "directories": {}, "dist": { -"shasum": "3ca76b85241c7170bf7d9703e7b9aa74630040d4", -"tarball": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; +"shasum": "63bc5dcb61331b92bc05fd528953c33462a06f8d", +"tarball": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; }, - "gitHead": "e88be37d3cd25395b4aa496ac468b33671368be6", - "license": "BSD-4-Clause", + "gitHead": "fa2ab3ae9efa15367264151398635a915c7b411d", + "license": "BSD-3-Clause", "main": "index.js", "maintainers": [ { "name": "arekinath", "email": "a...@cooperi.net" +}, +{ + "name": "dap", + "email": "d...@cs.brown.edu" +}, +{ + "name": "jclulow", + "email": "j...@sysmgr.org" +}, +{ + "name": "trentm", + "email": "tre...@gmail.com" } ], "name": "bcrypt-pbkdf", "optionalDependencies": {}, "readme": "ERROR: No README data found!", "scripts": {}, - "version": "1.0.0" + "version": "1.0.1" } diff --git a/node_modules/content-type/package.json b/node_modules/content-type/package.json index 8537df4..036da47 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": "158a6d94c2759089ece19408761522c04680c000", + "_shasum": "80d0649ab23cf810edc0d08f625b9270675e1c9f", "_shrinkwrap": null, "_spec": "content-type@git+https://github.com/wikimedia/content-type.git#master";, "_where": "/opt/service", diff --git a/node_modules/json-stable-stringify/package.json b/node_modules/json-stable-stringify/package.json
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to e628423
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/335673 ) Change subject: Update restbase to e628423 .. Update restbase to e628423 List of changes: 9d1daff Stop using deprecated ServiceRunner.run() e628423 Revert "Abstracted the common feed functionality" xxx Update node module dependencies Change-Id: I1eb8cc3c75965b86921f1470efde1f842df89467 --- M node_modules/bcrypt-pbkdf/index.js M node_modules/bcrypt-pbkdf/package.json M node_modules/content-type/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 7 files changed, 30 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/73/335673/1 diff --git a/node_modules/bcrypt-pbkdf/index.js b/node_modules/bcrypt-pbkdf/index.js index ea29aa9..b1b5ad4 100644 --- a/node_modules/bcrypt-pbkdf/index.js +++ b/node_modules/bcrypt-pbkdf/index.js @@ -29,10 +29,7 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Niels Provos. - * 4. The name of the author may not be used to endorse or promote products + * 3. The name of the author may not be used to endorse or promote products *derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR diff --git a/node_modules/bcrypt-pbkdf/package.json b/node_modules/bcrypt-pbkdf/package.json index b5d6352..0157b70 100644 --- a/node_modules/bcrypt-pbkdf/package.json +++ b/node_modules/bcrypt-pbkdf/package.json @@ -14,19 +14,19 @@ ] ], "_from": "bcrypt-pbkdf@>=1.0.0 <2.0.0", - "_id": "bcrypt-pbkdf@1.0.0", + "_id": "bcrypt-pbkdf@1.0.1", "_inCache": true, "_location": "/bcrypt-pbkdf", - "_nodeVersion": "0.12.15", + "_nodeVersion": "0.12.9", "_npmOperationalInternal": { -"host": "packages-16-east.internal.npmjs.com", -"tmp": "tmp/bcrypt-pbkdf-1.0.0.tgz_1471381825814_0.06877309852279723" +"host": "packages-18-east.internal.npmjs.com", +"tmp": "tmp/bcrypt-pbkdf-1.0.1.tgz_1486007687899_0.974529881728813" }, "_npmUser": { "name": "arekinath", "email": "a...@cooperi.net" }, - "_npmVersion": "3.10.3", + "_npmVersion": "2.14.9", "_phantomChildren": {}, "_requested": { "raw": "bcrypt-pbkdf@^1.0.0", @@ -40,8 +40,8 @@ "_requiredBy": [ "/sshpk" ], - "_resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz";, - "_shasum": "3ca76b85241c7170bf7d9703e7b9aa74630040d4", + "_resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";, + "_shasum": "63bc5dcb61331b92bc05fd528953c33462a06f8d", "_shrinkwrap": null, "_spec": "bcrypt-pbkdf@^1.0.0", "_where": "/opt/service/node_modules/sshpk", @@ -52,21 +52,33 @@ "devDependencies": {}, "directories": {}, "dist": { -"shasum": "3ca76b85241c7170bf7d9703e7b9aa74630040d4", -"tarball": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; +"shasum": "63bc5dcb61331b92bc05fd528953c33462a06f8d", +"tarball": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; }, - "gitHead": "e88be37d3cd25395b4aa496ac468b33671368be6", - "license": "BSD-4-Clause", + "gitHead": "fa2ab3ae9efa15367264151398635a915c7b411d", + "license": "BSD-3-Clause", "main": "index.js", "maintainers": [ { "name": "arekinath", "email": "a...@cooperi.net" +}, +{ + "name": "dap", + "email": "d...@cs.brown.edu" +}, +{ + "name": "jclulow", + "email": "j...@sysmgr.org" +}, +{ + "name": "trentm", + "email": "tre...@gmail.com" } ], "name": "bcrypt-pbkdf", "optionalDependencies": {}, "readme": "ERROR: No README data found!", "scripts": {}, - "version": "1.0.0" + "version": "1.0.1" } diff --git a/node_modules/content-type/package.json b/node_modules/content-type/package.json index 8537df4..036da47 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": "158a6d94c2759089ece19408761522c04680c000", + "_shasum": "80d0649ab23cf810edc0d08f625b9270675e1c9f", "_shrinkwrap": null, "_spec": "content-type@git+https://github.com/wikimedia/content-type.git#master";, "_where": "/opt/service", diff --git a/node_modules/json-stable-stringify/package.json b/node_modules