From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 22 Sep 2017 17:35:07 +0000 (+0000)
Subject: Merge "RCFilters: remove wgStructuredChangeFiltersEnableExperimentalViews"
X-Git-Tag: 1.31.0-rc.0~1992
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=b32408604fb28108920969025ba0d38b04622a74;hp=a2446aa81b27b1d2b90380e08b001cec4a26b13e;p=lhc%2Fweb%2Fwiklou.git

Merge "RCFilters: remove wgStructuredChangeFiltersEnableExperimentalViews"
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5630dcbeee..27f95ad0a0 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6812,14 +6812,6 @@ $wgUseRCPatrol = true;
  */
 $wgStructuredChangeFiltersShowPreference = false;
 
-/**
- * Whether to show the new experimental views (like namespaces, tags, and users) in
- * RecentChanges filters
- *
- * Temporary variable during development and will be removed.
- */
-$wgStructuredChangeFiltersEnableExperimentalViews = false;
-
 /**
  * Whether to enable RCFilters app on Special:Watchlist
  *
diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index dd0dd92a98..cf6c8e348d 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -600,14 +600,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 				)
 			);
 
-			$experimentalStructuredChangeFilters =
-				$this->getConfig()->get( 'StructuredChangeFiltersEnableExperimentalViews' );
-
 			$out->addJsConfigVars( 'wgStructuredChangeFilters', $jsData['groups'] );
-			$out->addJsConfigVars(
-				'wgStructuredChangeFiltersEnableExperimentalViews',
-				$experimentalStructuredChangeFilters
-			);
 
 			$out->addJsConfigVars(
 				'wgRCFiltersChangeTags',
diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
index 58e4d29c42..4eec02a9af 100644
--- a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
+++ b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
@@ -213,9 +213,6 @@
 			'group2filter5-desc': 'Description of Filter 5 in Group 2',
 			'group2filter6-label': 'xGroup 2: Filter 6',
 			'group2filter6-desc': 'Description of Filter 6 in Group 2'
-		},
-		config: {
-			wgStructuredChangeFiltersEnableExperimentalViews: true
 		}
 	} ) );