Merge "User::isPingLimitable(): handle CIDR notation in $wgRateLimitsExcludedIPs"

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

Tue, 21 Feb 2017 18:34:15 +0000 (18:34 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 21 Feb 2017 18:34:15 +0000 (18:34 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 21 Feb 2017 18:34:15 +0000 (18:34 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 21 Feb 2017 18:34:15 +0000 (18:34 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc tests/phpunit/includes/user/UserTest.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 21 Feb 2017 18:34:15 +0000 (18:34 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 21 Feb 2017 18:34:15 +0000 (18:34 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/includes/user/UserTest.php	patch \|	diff1 \|	diff2 \|	blob \| history