Merge "Make UserEditCountUpdate::doUpdate avoid comparing IDatabase instances"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Tue, 2 Jul 2019 21:57:10 +0000 (21:57 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 2 Jul 2019 21:57:10 +0000 (21:57 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 2 Jul 2019 21:57:10 +0000 (21:57 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 2 Jul 2019 21:57:10 +0000 (21:57 +0000)
diff --cc includes/deferred/UserEditCountUpdate.php
Simple merge
diff --cc includes/user/User.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 2 Jul 2019 21:57:10 +0000 (21:57 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 2 Jul 2019 21:57:10 +0000 (21:57 +0000)
		1	2
includes/deferred/UserEditCountUpdate.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/user/User.php	patch \|	diff1 \|	diff2 \|	blob \| history