jenkins-bot has submitted this change and it was merged.

Change subject: Organize BetaFeatures labs overrides cleanly
......................................................................


Organize BetaFeatures labs overrides cleanly

Put all BetaFeatures in one section.  No other changes.

Change-Id: Ice80910684947673d3d87476298e649c03c06933
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 15 insertions(+), 9 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  Jforrester: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index b34143d..f46ecb0 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -250,15 +250,6 @@
                'default' => true,
        ),
 
-       'wmgUseBetaFeatures' => array(
-               'default' => true,
-       ),
-
-       // Enable all Beta Features in Beta Labs, even if not in production 
whitelist
-       'wmgBetaFeaturesWhitelist' => array(
-               'default' => false,
-       ),
-
        'wmgUseCommonsMetadata' => array(
                'default' => true,
        ),
@@ -271,6 +262,20 @@
        // Don't use an http/https proxy
        '-wgCopyUploadProxy' => array(
                'default' => false,
+       ),
+
+       // ----------- BetaFeatures start ----------
+       'wmgUseBetaFeatures' => array(
+               'default' => true,
+       ),
+
+       // Enable all Beta Features in Beta Labs, even if not in production 
whitelist
+       'wmgBetaFeaturesWhitelist' => array(
+               'default' => false,
+       ),
+
+       'wmgUseCommonsMetadata' => array(
+               'default' => true,
        ),
 
        'wmgUseMultimediaViewer' => array(
@@ -314,6 +319,7 @@
        'wmgVisualEditorEnableTocWidget' => array(
                'enwiki' => true,
        ),
+       // ------------ BetaFeatures end -----------
 
        'wmgUseRSSExtension' => array(
                'dewiki' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice80910684947673d3d87476298e649c03c06933
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Spage <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to