Merge "Convert article delete to use OOUI"

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 852ccc6..11f08b2 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6118,7 +6118,10 @@ $wgTrxProfilerLimits = [
        'PostSend' => [
                'readQueryTime' => 5,
                'writeQueryTime' => 1,
-               'maxAffected' => 1000
+               'maxAffected' => 1000,
+               // Log master queries under the post-send entry point as they are discouraged
+               'masterConns' => 0,
+               'writes' => 0,
        ],
        // Background job runner
        'JobRunner' => [
@@ -6330,15 +6333,16 @@ $wgSiteStatsAsyncFactor = false;
  * Parser test suite files to be run by parserTests.php when no specific
  * filename is passed to it.
  *
- * Extensions may add their own tests to this array, or site-local tests
- * may be added via LocalSettings.php
+ * Extensions using extension.json will have any *.txt file in a
+ * tests/parser/ directory automatically run.
+ *
+ * Core tests can be added to ParserTestRunner::$coreTestFiles.
  *
  * Use full paths.
+ *
+ * @deprecated since 1.30
  */
-$wgParserTestFiles = [
-       "$IP/tests/parser/parserTests.txt",
-       "$IP/tests/parser/extraParserTests.txt"
-];
+$wgParserTestFiles = [];
 
 /**
  * Allow running of javascript test suites via [[Special:JavaScriptTest]] (such as QUnit).
@@ -6775,6 +6779,11 @@ $wgStructuredChangeFiltersEnableSaving = true;
  */
 $wgStructuredChangeFiltersEnableExperimentalViews = false;
 
+/**
+ * Whether to allow users to use the experimental live update feature in the new RecentChanges UI
+ */
+$wgStructuredChangeFiltersEnableLiveUpdate = false;
+
 /**
  * Use new page patrolling to check new pages on Special:Newpages
  */