Merge "JavaScriptMinifier: Merge $push and $pop into $model"

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 03dbfb9..e81909a 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3809,38 +3809,6 @@ $wgResourceLoaderValidateJS = true;
  */
 $wgResourceLoaderValidateStaticJS = false;
 
-/**
- * Global LESS variables. An associative array binding variable names to
- * LESS code snippets representing their values.
- *
- * Adding an item here is equivalent to writing `@variable: value;`
- * at the beginning of all your .less files, with all the consequences.
- * In particular, string values must be escaped and quoted.
- *
- * Changes to this configuration do NOT trigger cache invalidation.
- *
- * @par Example:
- * @code
- *   $wgResourceLoaderLESSVars = [
- *     'exampleFontSize'  => '1em',
- *     'exampleBlue' => '#36c',
- *   ];
- * @endcode
- * @since 1.22
- * @deprecated since 1.30 Use ResourceLoaderModule::getLessVars() instead to
- *  add variables to individual modules that need them.
- */
-$wgResourceLoaderLESSVars = [
-       /**
-        * Minimum available screen width at which a device can be considered a tablet
-        * The number is currently based on the device width of a Samsung Galaxy S5 mini and is low
-        * enough to cover iPad (768px). Number is prone to change with new information.
-        * @since 1.27
-        * @deprecated 1.31 Use mediawiki.ui/variables instead
-        */
-       'deviceWidthTablet' => '720px',
-];
-
 /**
  * Whether ResourceLoader should attempt to persist modules in localStorage on
  * browsers that support the Web Storage API.
@@ -6189,24 +6157,28 @@ $wgTrxProfilerLimits = [
        'GET' => [
                'masterConns' => 0,
                'writes' => 0,
-               'readQueryTime' => 5
+               'readQueryTime' => 5,
+               'readQueryRows' => 10000
        ],
        // HTTP POST requests.
        // Master reads and writes will happen for a subset of these.
        'POST' => [
                'readQueryTime' => 5,
                'writeQueryTime' => 1,
+               'readQueryRows' => 100000,
                'maxAffected' => 1000
        ],
        'POST-nonwrite' => [
                'masterConns' => 0,
                'writes' => 0,
-               'readQueryTime' => 5
+               'readQueryTime' => 5,
+               'readQueryRows' => 10000
        ],
        // Deferred updates that run after HTTP response is sent for GET requests
        'PostSend-GET' => [
                'readQueryTime' => 5,
                'writeQueryTime' => 1,
+               'readQueryRows' => 10000,
                'maxAffected' => 1000,
                // Log master queries under the post-send entry point as they are discouraged
                'masterConns' => 0,
@@ -6216,12 +6188,14 @@ $wgTrxProfilerLimits = [
        'PostSend-POST' => [
                'readQueryTime' => 5,
                'writeQueryTime' => 1,
+               'readQueryRows' => 100000,
                'maxAffected' => 1000
        ],
        // Background job runner
        'JobRunner' => [
                'readQueryTime' => 30,
                'writeQueryTime' => 5,
+               'readQueryRows' => 100000,
                'maxAffected' => 500 // ballpark of $wgUpdateRowsPerQuery
        ],
        // Command-line scripts
@@ -7206,7 +7180,7 @@ $wgRightsUrl = null;
 
 /**
  * If either $wgRightsUrl or $wgRightsPage is specified then this variable gives the text for the
- * link.
+ * link. Otherwise, it will be treated as raw HTML.
  * If using $wgRightsUrl then this value must be specified. If using $wgRightsPage then the name
  * of the page will also be used as the link if this variable is not set.
  */
@@ -8820,7 +8794,7 @@ $wgSearchRunSuggestedQuery = true;
  * @since 1.27
  * @var string path to file
  */
-$wgPopularPasswordFile = __DIR__ . '/../serialized/commonpasswords.cdb';
+$wgPopularPasswordFile = __DIR__ . '/password/commonpasswords.cdb';
 
 /*
  * Max time (in seconds) a user-generated transaction can spend in writes.