jenkins-bot has submitted this change and it was merged.
Change subject: Made use of new USE_MULTI_COMMIT flag in user merge jobs
......................................................................
Made use of new USE_MULTI_COMMIT flag in user merge jobs
Change-Id: I5c80c424f37f507e33d481bacf2ca17571d74fe3
(cherry picked from commit 8712e3545547a95d853fe24cffbe4f678f910ce0)
---
M includes/LocalRenameJob/LocalUserMergeJob.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/LocalRenameJob/LocalUserMergeJob.php
b/includes/LocalRenameJob/LocalUserMergeJob.php
old mode 100644
new mode 100755
index 7ab3ba5..e1547fd
--- a/includes/LocalRenameJob/LocalUserMergeJob.php
+++ b/includes/LocalRenameJob/LocalUserMergeJob.php
@@ -31,7 +31,8 @@
$um = new MergeUser(
User::newFromName( $olduser ),
$toUser,
- new UserMergeLogger()
+ new UserMergeLogger(),
+ MergeUser::USE_MULTI_COMMIT
);
$um->merge( $renamingUser );
$um->delete( $renamingUser, 'wfMessage' );
--
To view, visit https://gerrit.wikimedia.org/r/222497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c80c424f37f507e33d481bacf2ca17571d74fe3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
