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

Change subject: Remove old stuff
......................................................................


Remove old stuff

Change-Id: I106201451ccf1983cdd6efce6f812830820ccc94
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/mobile-labs.php
M wmf-config/mobile.php
4 files changed, 0 insertions(+), 27 deletions(-)

Approvals:
  Kaldari: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 69cc477..a875f1a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2361,11 +2361,6 @@
                $wgAPIListModules['geosearch'] = 'ApiQueryDisabled';
        }
 
-       # These modules have been intentionally disabled for the first phase of 
deployment
-       if ( $wgDBname !== 'testwiki' ) {
-               unset( $wgAPIListModules['geopages'] );
-               unset( $wgAPIListModules['geopagesincategory'] );
-       }
        $wgMaxCoordinatesPerPage = 2000;
        $wgMaxGeoSearchRadius = $wmgMaxGeoSearchRadius;
        $wgGeoDataDebug = $wmgGeoDataDebug;
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 621a904..6bc1a6a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11826,21 +11826,11 @@
        'private' => '',
        'fishbowl' => '',
 ),
-'wmgMFKeepGoing' => array(
-       'default' => false,
-       'enwiki' => true,
-),
-'wmgMFInfoboxLogging' => array(
-       'default' => false,
-),
 'wmgMFContentNamespace' => array(
        'default' => NS_MAIN,
        'commonswiki' => NS_FILE,
 ),
 'wmgMFUseCentralAuthToken' => array(
-       'default' => true,
-),
-'wmgMFForceSecureLogin' => array(
        'default' => true,
 ),
 'wmgMFNearby' => array(
@@ -11876,9 +11866,6 @@
 'wmgMFNoMobilePages' => array(
        'default' => array(),
        'foundationwiki' => array( 'Special:FundraiserStatistics' ),
-),
-'wmgMFEnablePhotoUploadCTA' => array(
-       'default' => false,
 ),
 'wmgMFCollapseSectionsByDefault' => array(
        'default' => true,
diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php
index adcb071..2df771a 100644
--- a/wmf-config/mobile-labs.php
+++ b/wmf-config/mobile-labs.php
@@ -17,6 +17,3 @@
 
 $wgMFForceSecureLogin = false;
 $wgMFUseCentralAuthToken = $wmgMFUseCentralAuthToken;
-
-// Keep Going experiments
-$wgMFKeepGoing = true;
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 3d6f3ce..a48b5af 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -15,8 +15,6 @@
        // FIXME: Remove in a week when cache has cleared
        $wgMFNearbyNamespace = $wmgMFContentNamespace;
        $wgMFPhotoUploadAppendToDesc = $wmgMFPhotoUploadAppendToDesc;
-       $wgMFInfoboxLogging = $wmgMFInfoboxLogging;
-       $wgMFKeepGoing = $wmgMFKeepGoing;
 
        if ( $wmgMobileFrontendLogo ) {
                $wgMobileFrontendLogo = $wmgMobileFrontendLogo;
@@ -57,9 +55,6 @@
        // Enable appending of TM (text) / (R) (icon) on site name in footer.
        $wgMFTrademarkSitename = $wmgMFTrademarkSitename;
 
-       // Force HTTPS for login/account creation
-       $wgMFForceSecureLogin = $wmgMFForceSecureLogin;
-
        // Enable X-Analytics logging
        $wgMFEnableXAnalyticsLogging = $wmgMFEnableXAnalyticsLogging;
 
@@ -87,7 +82,6 @@
        };
 
        $wgMFEnableSiteNotice = $wmgMFEnableSiteNotice;
-       $wgMFEnablePhotoUploadCTA = $wmgMFEnablePhotoUploadCTA;
        $wgMFCollapseSectionsByDefault = $wmgMFCollapseSectionsByDefault;
        $wgMFTidyMobileViewSections = false; // experimental
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I106201451ccf1983cdd6efce6f812830820ccc94
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to