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

Change subject: Remove MediaViewer survey-related settings
......................................................................


Remove MediaViewer survey-related settings

Depends on I67285260c13a1e8d3c37365bb80a7156c0fecd4e

Change-Id: Ib2f1fcb804442059e8c7e2e272b38259d044da6a
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/794
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 0 insertions(+), 13 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d8ec6ef..5f7824c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1833,10 +1833,6 @@
        if ( $wmgMediaViewerUseThumbnailGuessing ) {
                $wgMediaViewerUseThumbnailGuessing = true;
        }
-
-       if ( $wmgMediaViewerShowSurvey ) {
-               $wgMediaViewerShowSurvey = $wmgMediaViewerShowSurvey;
-       }
 }
 
 if ( $wmgUsePopups ) {
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index afef361..4af1918 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -303,11 +303,6 @@
                'default' => false,
        ),
 
-       'wmgMediaViewerShowSurvey' => array(
-               'default' => false,
-               'enwiki' => true,
-       ),
-
        'wmgNetworkPerformanceSamplingFactor' => array(
                'default' => 1,
        ),
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6900e5d..8d4221f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10903,10 +10903,6 @@
        'default' => true,
 ),
 
-'wmgMediaViewerShowSurvey' => array(
-       'default' => false,
-),
-
 'wmgNetworkPerformanceSamplingFactor' => array(
        'default' => 10, // beta feature users do not generate enough data with 
1:1000
        'mediaviewer' => 1000,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2f1fcb804442059e8c7e2e272b38259d044da6a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to