jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338098 )
Change subject: Merge remote-tracking branch 'origin/master' into es5
......................................................................
Merge remote-tracking branch 'origin/master' into es5
Change-Id: Iff9392a2189ba68d1cf277e459cfebb71e96c062
---
M composer.lock
M composer/installed.json
2 files changed, 6 insertions(+), 95 deletions(-)
Approvals:
jenkins-bot: Verified
DCausse: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index cf1df4f..1cb6063 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,13 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-<<<<<<< HEAD (befd1a Merge remote-tracking branch 'origin/master' into es5)
- "hash": "d0cf7e4112675e807d79308cfe153819",
- "content-hash": "6ca997834f6157671342f012fa44da6a",
-=======
- "hash": "ab18d8e0cc932fec99b526c2d1e1fafc",
- "content-hash": "17e19b0718d463c61c3be9db39fc18e2",
->>>>>>> BRANCH (ac2895 [Re-apply] Update OOjs UI to v0.19.2)
+ "hash": "2864cd5a28afff034a92dd6356a22687",
+ "content-hash": "dae6030c2992b8d32e47c8111a724cdf",
"packages": [
{
"name": "composer/semver",
@@ -434,12 +429,12 @@
"version": "v0.1.5",
"source": {
"type": "git",
- "url": "https://github.com/nmred/kafka-php.git";,
+ "url": "https://github.com/weiboad/kafka-php.git";,
"reference": "317ad8c208684db8b9e6d2f5bf7f471e89a8b4eb"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/nmred/kafka-php/zipball/317ad8c208684db8b9e6d2f5bf7f471e89a8b4eb";,
+ "url":
"https://api.github.com/repos/weiboad/kafka-php/zipball/317ad8c208684db8b9e6d2f5bf7f471e89a8b4eb";,
"reference": "317ad8c208684db8b9e6d2f5bf7f471e89a8b4eb",
"shasum": ""
},
diff --git a/composer/installed.json b/composer/installed.json
index 32fc46d..ed64fdd 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -57,12 +57,12 @@
"version_normalized": "0.1.5.0",
"source": {
"type": "git",
- "url": "https://github.com/nmred/kafka-php.git";,
+ "url": "https://github.com/weiboad/kafka-php.git";,
"reference": "317ad8c208684db8b9e6d2f5bf7f471e89a8b4eb"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/nmred/kafka-php/zipball/317ad8c208684db8b9e6d2f5bf7f471e89a8b4eb";,
+ "url":
"https://api.github.com/repos/weiboad/kafka-php/zipball/317ad8c208684db8b9e6d2f5bf7f471e89a8b4eb";,
"reference": "317ad8c208684db8b9e6d2f5bf7f471e89a8b4eb",
"shasum": ""
},
@@ -1836,88 +1836,6 @@
"description": "PHP port of the TextCat language guesser utility, see
http://odur.let.rug.nl/~vannoord/TextCat/.";
},
{
-<<<<<<< HEAD (befd1a Merge remote-tracking branch 'origin/master' into es5)
- "name": "oojs/oojs-ui",
- "version": "v0.19.1",
- "version_normalized": "0.19.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/oojs-ui.git";,
- "reference": "5663021216302da80fdb335b5ed9f3cd49b4a605"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5663021216302da80fdb335b5ed9f3cd49b4a605";,
- "reference": "5663021216302da80fdb335b5ed9f3cd49b4a605",
- "shasum": ""
- },
- "require": {
- "mediawiki/at-ease": "1.1.0",
- "php": ">=5.5.9"
- },
- "require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.6.0",
- "phpunit/phpunit": "4.8.21"
- },
- "time": "2017-02-08 00:17:30",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "php/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Timo Tijhof",
- "email": "[email protected]"
- },
- {
- "name": "Bartosz Dziewoński",
- "email": "[email protected]"
- },
- {
- "name": "Ed Sanders",
- "email": "[email protected]"
- },
- {
- "name": "James D. Forrester",
- "email": "[email protected]"
- },
- {
- "name": "Kirsten Menger-Anderson",
- "email": "[email protected]"
- },
- {
- "name": "Rob Moen",
- "email": "[email protected]"
- },
- {
- "name": "Roan Kattouw",
- "email": "[email protected]"
- },
- {
- "name": "Trevor Parscal",
- "email": "[email protected]"
- },
- {
- "name": "Kunal Mehta",
- "email": "[email protected]"
- },
- {
- "name": "Prateek Saxena",
- "email": "[email protected]"
- }
- ],
- "description": "Provides library of common widgets, layouts, and
windows.",
- "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";
- },
- {
"name": "ruflin/elastica",
"version": "5.0.0",
"version_normalized": "5.0.0.0",
@@ -1941,8 +1859,6 @@
}
},
{
-=======
->>>>>>> BRANCH (ac2895 [Re-apply] Update OOjs UI to v0.19.2)
"name": "cssjanus/cssjanus",
"version": "v1.1.3",
"version_normalized": "1.1.3.0",
--
To view, visit https://gerrit.wikimedia.org/r/338098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff9392a2189ba68d1cf277e459cfebb71e96c062
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: es5
Gerrit-Owner: DCausse <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
