Merge "Introduce ClearUserWatchlistJob"

diff --combined autoload.php
index 2231a3f,5ee4447..51daced
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -265,6 -265,7 +265,7 @@@ $wgAutoloadLocalClasses = 
        'CleanupRemovedModules' => __DIR__ . '/maintenance/cleanupRemovedModules.php',
        'CleanupSpam' => __DIR__ . '/maintenance/cleanupSpam.php',
        'ClearInterwikiCache' => __DIR__ . '/maintenance/clearInterwikiCache.php',
+       'ClearUserWatchlistJob' => __DIR__ . '/includes/jobqueue/jobs/ClearUserWatchlistJob.php',
        'CliInstaller' => __DIR__ . '/includes/installer/CliInstaller.php',
        'CloneDatabase' => __DIR__ . '/includes/db/CloneDatabase.php',
        'CodeCleanerGlobalsPass' => __DIR__ . '/maintenance/CodeCleanerGlobalsPass.inc',
@@@ -312,7 -313,6 +313,7 @@@
        'CreateAndPromote' => __DIR__ . '/maintenance/createAndPromote.php',
        'CreateFileOp' => __DIR__ . '/includes/libs/filebackend/fileop/CreateFileOp.php',
        'CreditsAction' => __DIR__ . '/includes/actions/CreditsAction.php',
 +      'CrhConverter' => __DIR__ . '/languages/classes/LanguageCrh.php',
        'CryptHKDF' => __DIR__ . '/includes/libs/CryptHKDF.php',
        'CryptRand' => __DIR__ . '/includes/libs/CryptRand.php',
        'CssContent' => __DIR__ . '/includes/content/CssContent.php',
@@@ -707,7 -707,6 +708,7 @@@
        'LanguageBs' => __DIR__ . '/languages/classes/LanguageBs.php',
        'LanguageCode' => __DIR__ . '/languages/LanguageCode.php',
        'LanguageConverter' => __DIR__ . '/languages/LanguageConverter.php',
 +      'LanguageCrh' => __DIR__ . '/languages/classes/LanguageCrh.php',
        'LanguageCu' => __DIR__ . '/languages/classes/LanguageCu.php',
        'LanguageDsb' => __DIR__ . '/languages/classes/LanguageDsb.php',
        'LanguageEn' => __DIR__ . '/languages/classes/LanguageEn.php',
@@@ -887,7 -886,6 +888,7 @@@
        'MediaWiki\\Interwiki\\ClassicInterwikiLookup' => __DIR__ . '/includes/interwiki/ClassicInterwikiLookup.php',
        'MediaWiki\\Interwiki\\InterwikiLookup' => __DIR__ . '/includes/interwiki/InterwikiLookup.php',
        'MediaWiki\\Interwiki\\InterwikiLookupAdapter' => __DIR__ . '/includes/interwiki/InterwikiLookupAdapter.php',
 +      'MediaWiki\\Languages\\Data\\CrhExceptions' => __DIR__ . '/languages/data/CrhExceptions.php',
        'MediaWiki\\Languages\\Data\\Names' => __DIR__ . '/languages/data/Names.php',
        'MediaWiki\\Languages\\Data\\ZhConversion' => __DIR__ . '/languages/data/ZhConversion.php',
        'MediaWiki\\Linker\\LinkRenderer' => __DIR__ . '/includes/linker/LinkRenderer.php',
@@@ -939,7 -937,6 +940,7 @@@
        'MediaWiki\\ShellDisabledError' => __DIR__ . '/includes/exception/ShellDisabledError.php',
        'MediaWiki\\Shell\\Command' => __DIR__ . '/includes/shell/Command.php',
        'MediaWiki\\Shell\\CommandFactory' => __DIR__ . '/includes/shell/CommandFactory.php',
 +      'MediaWiki\\Shell\\FirejailCommand' => __DIR__ . '/includes/shell/FirejailCommand.php',
        'MediaWiki\\Shell\\Result' => __DIR__ . '/includes/shell/Result.php',
        'MediaWiki\\Shell\\Shell' => __DIR__ . '/includes/shell/Shell.php',
        'MediaWiki\\Site\\MediaWikiPageNameNormalizer' => __DIR__ . '/includes/site/MediaWikiPageNameNormalizer.php',

diff --combined includes/DefaultSettings.php
index 25be60c,e378586..dcbcb6e
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -2554,8 -2554,6 +2554,8 @@@ $wgGitInfoCacheDirectory = false
   * It should be appended in the query string of static CSS and JS includes,
   * to ensure that client-side caches do not keep obsolete copies of global
   * styles.
 + *
 + * @deprecated since 1.31
   */
  $wgStyleVersion = '303';
  
@@@ -4883,6 -4881,7 +4883,6 @@@ $wgDefaultUserOptions = 
        'hidepatrolled' => 0,
        'hidecategorization' => 1,
        'imagesize' => 2,
 -      'math' => 1,
        'minordefault' => 0,
        'newpageshidepatrolled' => 0,
        'nickname' => '',
@@@ -7429,6 -7428,7 +7429,7 @@@ $wgJobClasses = 
        'refreshLinksDynamic' => 'RefreshLinksJob',
        'activityUpdateJob' => 'ActivityUpdateJob',
        'categoryMembershipChange' => 'CategoryMembershipChangeJob',
+       'clearUserWatchlist' => 'ClearUserWatchlistJob',
        'cdnPurge' => 'CdnPurgeJob',
        'enqueue' => 'EnqueueJob', // local queue for multi-DC setups
        'null' => 'NullJob'
@@@ -8271,22 -8271,6 +8272,22 @@@ $wgPhpCli = '/usr/bin/php'
   */
  $wgShellLocale = 'C.UTF-8';
  
 +/**
 + * Method to use to restrict shell commands
 + *
 + * Supported options:
 + * - 'autodetect': Autodetect if any restriction methods are available
 + * - 'firejail': Use firejail <https://firejail.wordpress.com/>
 + * - false: Don't use any restrictions
 + *
 + * @note If using firejail with MediaWiki running in a home directory different
 + *  from the webserver user, firejail 0.9.44+ is required.
 + *
 + * @since 1.31
 + * @var string|bool
 + */
 +$wgShellRestrictionMethod = false;
 +
  /** @} */ # End shell }
  
  /************************************************************************//**