jenkins-bot has submitted this change and it was merged.
Change subject: Temporarily enable $wgCentralAuthEnableUserMerge
......................................................................
Temporarily enable $wgCentralAuthEnableUserMerge
Change-Id: I90260093edfa67c25211d2f66750b0d8431702c2
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 39809b1..7631ab8 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1266,6 +1266,9 @@
// Enables login using pre-SULF username and notification
$wgCentralAuthCheckSULMigration = true;
+
+ // temporary for testing -- legoktm 2015-07-02
+ $wgCentralAuthEnableUserMerge = true;
}
// Config for GlobalCssJs
--
To view, visit https://gerrit.wikimedia.org/r/222464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90260093edfa67c25211d2f66750b0d8431702c2
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
