Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371423 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0 ...................................................................... build: Updating mediawiki/mediawiki-codesniffer to 0.11.0 Change-Id: I6b4496e12e29b84f7946c4b18508231906f55612 --- M MergeUser.php M composer.json 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge refs/changes/23/371423/1 diff --git a/MergeUser.php b/MergeUser.php index 2e525c2..6b3e09d 100755 --- a/MergeUser.php +++ b/MergeUser.php @@ -216,8 +216,8 @@ [ 'image', 'img_user', 'img_user_text', 'batchKey' => 'img_name' ], [ 'oldimage', 'oi_user', 'oi_user_text', 'batchKey' => 'oi_archive_name' ], [ 'recentchanges', 'rc_user', 'rc_user_text', 'batchKey' => 'rc_id' ], - [ 'logging', 'log_user', 'batchKey' =>'log_id' ], - [ 'ipblocks', 'ipb_by', 'ipb_by_text', 'batchKey' =>'ipb_id' ], + [ 'logging', 'log_user', 'batchKey' => 'log_id' ], + [ 'ipblocks', 'ipb_by', 'ipb_by_text', 'batchKey' => 'ipb_id' ], [ 'watchlist', 'wl_user', 'batchKey' => 'wl_title' ], [ 'user_groups', 'ug_user', 'options' => [ 'IGNORE' ] ], [ 'user_properties', 'up_user', 'options' => [ 'IGNORE' ] ], diff --git a/composer.json b/composer.json index d368985..a4c40a7 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.10.1", + "mediawiki/mediawiki-codesniffer": "0.11.0", "jakub-onderka/php-console-highlighter": "0.3.2" }, "scripts": { -- To view, visit https://gerrit.wikimedia.org/r/371423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b4496e12e29b84f7946c4b18508231906f55612 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UserMerge Gerrit-Branch: master Gerrit-Owner: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits