Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/329535 )
Change subject: Merge branch 'master' into deployment ...................................................................... Merge branch 'master' into deployment And update vendor e1e7c42 Localisation updates from https://translatewiki.net. c4729eb Localisation updates from https://translatewiki.net. 951d084 Adyen iframe form fields should be white on mobile ef776f2 Add 'maxlength' attributes to personal info fields 01069be Localisation updates from https://translatewiki.net. 65c6d0f Localisation updates from https://translatewiki.net. 2de0945 Localisation updates from https://translatewiki.net. 6823f20 update composer.lock 81061a5 Revert "update composer.lock" 4fca4ba Update (only) phpmailer in composer.lock Change-Id: Ia975d6f47d1295fac02e2035f9f40e1ef55663bc --- M composer.lock M vendor 2 files changed, 53 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/35/329535/1 diff --git a/composer.lock b/composer.lock index f1f8c44..e18e257 100644 --- a/composer.lock +++ b/composer.lock @@ -198,6 +198,7 @@ "messaging", "stomp" ], + "abandoned": "stomp-php/stomp-php", "time": "2013-02-23 17:34:44" }, { @@ -886,7 +887,7 @@ "source": { "type": "git", "url": "https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git";, - "reference": "61f47be34b4c8ade307bf218b84c55966a8e4acb" + "reference": "8625a3502c2f7f48b6ed0e388d95b35a6398ad9f" }, "require": { "amzn/login-and-pay-with-amazon-sdk-php": "dev-master", @@ -937,7 +938,7 @@ "donations", "payments" ], - "time": "2016-09-15 00:32:38" + "time": "2016-09-13 18:34:33" }, { "name": "zordius/lightncandy", @@ -987,7 +988,55 @@ "time": "2015-11-05 07:14:57" } ], - "packages-dev": null, + "packages-dev": [ + { + "name": "jakub-onderka/php-parallel-lint", + "version": "v0.9.2", + "source": { + "type": "git", + "url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git";, + "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa";, + "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "jakub-onderka/php-console-highlighter": "~0.3", + "nette/tester": "~1.3" + }, + "suggest": { + "jakub-onderka/php-console-highlighter": "Highlight syntax in code snippet" + }, + "bin": [ + "parallel-lint" + ], + "type": "library", + "autoload": { + "classmap": [ + "./" + ] + }, + "notification-url": "https://packagist.org/downloads/";, + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "jakub.onde...@gmail.com" + } + ], + "description": "This tool check syntax of PHP files about 20x faster than serial check.", + "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint";, + "time": "2015-12-15 10:42:16" + } + ], "aliases": [], "minimum-stability": "stable", "stability-flags": { diff --git a/vendor b/vendor index 4707185..78065ce 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit 470718556c34eb7bdfd6fe095f639c2bf035f438 +Subproject commit 78065ce486209a6c6ce1bbdc3263eef27564a26e -- To view, visit https://gerrit.wikimedia.org/r/329535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia975d6f47d1295fac02e2035f9f40e1ef55663bc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Ejegg <eeggles...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
