Merge "Enable $wgResourceLoaderStorageEnabled by default"

diff --combined includes/DefaultSettings.php
index b7fbbb7,c8cf5bc..828c8e7
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -685,7 -685,7 +685,7 @@@ $wgUseSharedUploads = false
  /**
   * Full path on the web server where shared uploads can be found
   */
 -$wgSharedUploadPath = "http://commons.wikimedia.org/shared/images";
 +$wgSharedUploadPath = null;
  
  /**
   * Fetch commons image description pages and display them on the local wiki?
@@@ -695,7 -695,7 +695,7 @@@ $wgFetchCommonsDescriptions = false
  /**
   * Path on the file system where shared uploads can be found.
   */
 -$wgSharedUploadDirectory = "/var/www/wiki3/images";
 +$wgSharedUploadDirectory = null;
  
  /**
   * DB name with metadata about shared directory.
@@@ -3193,15 -3193,6 +3193,15 @@@ $wgHTMLFormAllowTableFormat = true
   */
  $wgUseMediaWikiUIEverywhere = false;
  
 +/**
 + * Whether to label the store-to-database-and-show-to-others button in the editor
 + * as "Save page"/"Save changes" if false (the default) or, if true, instead as
 + * "Publish page"/"Publish changes".
 + *
 + * @since 1.28
 + */
 +$wgEditButtonPublishNotSave = false;
 +
  /**
   * Permit other namespaces in addition to the w3.org default.
   *
@@@ -3756,10 -3747,8 +3756,8 @@@ $wgResourceLoaderLESSImportPaths = 
  /**
   * Whether ResourceLoader should attempt to persist modules in localStorage on
   * browsers that support the Web Storage API.
-  *
-  * @since 1.23 - Client-side module persistence is experimental. Exercise care.
   */
- $wgResourceLoaderStorageEnabled = false;
+ $wgResourceLoaderStorageEnabled = true;
  
  /**
   * Cache version for client-side ResourceLoader module storage. You can trigger
@@@ -8042,13 -8031,9 +8040,13 @@@ $wgJobRunRate = 1
   * When $wgJobRunRate > 0, try to run jobs asynchronously, spawning a new process
   * to handle the job execution, instead of blocking the request until the job
   * execution finishes.
 + *
   * @since 1.23
   */
 -$wgRunJobsAsync = true;
 +$wgRunJobsAsync = (
 +      !function_exists( 'register_postsend_function' ) &&
 +      !function_exists( 'fastcgi_finish_request' )
 +);
  
  /**
   * Number of rows to update per job
@@@ -8263,29 -8248,11 +8261,29 @@@ $wgPageLanguageUseDB = false
  
  /**
   * Global configuration variable for Virtual REST Services.
 - * Parameters for different services are to be declared inside
 - * $wgVirtualRestConfig['modules'], which is to be treated as an associative
 - * array. Global parameters will be merged with service-specific ones. The
 - * result will then be passed to VirtualRESTService::__construct() in the
 - * module.
 + *
 + * Use the 'path' key to define automatically mounted services. The value for this
 + * key is a map of path prefixes to service configuration. The later is an array of:
 + *   - class : the fully qualified class name
 + *   - options : map of arguments to the class constructor
 + * Such services will be available to handle queries under their path from the VRS
 + * singleton, e.g. MediaWikiServices::getInstance()->getVirtualRESTServiceClient();
 + *
 + * Auto-mounting example for Parsoid:
 + *
 + * $wgVirtualRestConfig['paths']['/parsoid/'] = [
 + *     'class' => 'ParsoidVirtualRESTService',
 + *     'options' => [
 + *         'url' => 'http://localhost:8000',
 + *         'prefix' => 'enwiki',
 + *         'domain' => 'en.wikipedia.org'
 + *     ]
 + * ];
 + *
 + * Parameters for different services can also be declared inside the 'modules' value,
 + * which is to be treated as an associative array. The parameters in 'global' will be
 + * merged with service-specific ones. The result will then be passed to
 + * VirtualRESTService::__construct() in the module.
   *
   * Example config for Parsoid:
   *
@@@ -8299,7 -8266,6 +8297,7 @@@
   * @since 1.25
   */
  $wgVirtualRestConfig = [
 +      'paths' => [],
        'modules' => [],
        'global' => [
                # Timeout in seconds
@@@ -8374,35 -8340,13 +8372,35 @@@ $wgEventRelayerConfig = 
   * PHP version, and chosen database backend. The Wikimedia Foundation shares this data with
   * MediaWiki developers to help guide future development efforts.
   *
 - * For details about what data is sent, see: https://www.mediawiki.org/wiki/Pingback
 + * For details about what data is sent, see: https://www.mediawiki.org/wiki/Manual:$wgPingback
   *
   * @var bool
   * @since 1.28
   */
  $wgPingback = false;
  
 +/**
 + * List of urls which appear often to be triggering CSP reports
 + * but do not appear to be caused by actual content, but by client
 + * software inserting scripts (i.e. Ad-Ware).
 + * List based on results from Wikimedia logs.
 + *
 + * @since 1.28
 + */
 +$wgCSPFalsePositiveUrls = [
 +      'https://3hub.co' => true,
 +      'https://morepro.info' => true,
 +      'https://p.ato.mx' => true,
 +      'https://s.ato.mx' => true,
 +      'https://adserver.adtech.de' => true,
 +      'https://ums.adtechus.com' => true,
 +      'https://cas.criteo.com' => true,
 +      'https://cat.nl.eu.criteo.com' => true,
 +      'https://atpixel.alephd.com' => true,
 +      'https://rtb.metrigo.com' => true,
 +      'https://d5p.de17a.com' => true,
 +];
 +
  /**
   * For really cool vim folding this needs to be at the end:
   * vim: foldmarker=@{,@} foldmethod=marker