Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/292617

Change subject: Cleanup: Move never-altered DisableUnmergedEdits into 
CommonSettings
......................................................................

Cleanup: Move never-altered DisableUnmergedEdits into CommonSettings

Change-Id: I09e8a17cf577cae5507cd42de3c8cc2aef6eac53
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/17/292617/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4709091..ed98768 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1241,7 +1241,6 @@
        $wgGroupPermissions['steward']['centralauth-rename'] = true;
        $wgCentralAuthCookies = true;
 
-       $wgDisableUnmergedEditing = $wmgDisableUnmergedEdits;
        $wgCentralAuthUseEventLogging = true;
        $wgCentralAuthPreventUnattached = true;
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 21ced97..63bf236 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15698,11 +15698,6 @@
        'private' => false,
 ],
 
-'wmgDisableUnmergedEdits' => [
-       'default' => false,
-       'wikivoyage' => false,
-],
-
 'wmgUseGeoCrumbs' => [
        'default' => false,
        'incubatorwiki' => true, // T46725

-- 
To view, visit https://gerrit.wikimedia.org/r/292617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09e8a17cf577cae5507cd42de3c8cc2aef6eac53
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to