jenkins-bot has submitted this change and it was merged.
Change subject: Disable global merge
......................................................................
Disable global merge
Change-Id: Ic7d7b002897d54f3d02d7630bf25f3818173974b
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 022851a..e7277fe 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1269,7 +1269,7 @@
// temporary for testing -- legoktm 2015-07-02
if ( $wgDBname === 'metawiki' ) {
- $wgCentralAuthEnableUserMerge = true;
+ $wgCentralAuthEnableUserMerge = false;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/222477
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7d7b002897d54f3d02d7630bf25f3818173974b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
