Merge "Generalize recentChangesFlags rollup"

diff --combined includes/DefaultSettings.php
index 0e6aabb,8f41cde..facb92f
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -3562,7 -3562,7 +3562,7 @@@ $wgResourceLoaderMinifierMaxLineLength 
   *
   * @deprecated since 1.26: Always declare dependencies.
   */
 -$wgIncludeLegacyJavaScript = true;
 +$wgIncludeLegacyJavaScript = false;
  
  /**
   * Whether or not to assign configuration variables to the global window object.
@@@ -4631,15 -4631,15 +4631,15 @@@ $wgAuthenticationTokenVersion = null
   * @since 1.27
   */
  $wgSessionProviders = [
 -      'MediaWiki\\Session\\CookieSessionProvider' => [
 -              'class' => 'MediaWiki\\Session\\CookieSessionProvider',
 +      MediaWiki\Session\CookieSessionProvider::class => [
 +              'class' => MediaWiki\Session\CookieSessionProvider::class,
                'args' => [ [
                        'priority' => 30,
                        'callUserSetCookiesHook' => true,
                ] ],
        ],
 -      'MediaWiki\\Session\\BotPasswordSessionProvider' => [
 -              'class' => 'MediaWiki\\Session\\BotPasswordSessionProvider',
 +      MediaWiki\Session\BotPasswordSessionProvider::class => [
 +              'class' => MediaWiki\Session\BotPasswordSessionProvider::class,
                'args' => [ [
                        'priority' => 40,
                ] ],
@@@ -6210,15 -6210,14 +6210,15 @@@ $wgGitBin = '/usr/bin/git'
   * %h will be replaced by the short SHA-1 (7 first chars) and %H by the
   * full SHA-1 of the HEAD revision.
   * %r will be replaced with a URL-encoded version of $1.
 + * %R will be replaced with $1 and no URL-encoding
   *
   * @since 1.20
   */
  $wgGitRepositoryViewers = [
        'https://(?:[a-z0-9_]+@)?gerrit.wikimedia.org/r/(?:p/)?(.*)' =>
 -              'https://git.wikimedia.org/tree/%r/%H',
 +              'https://phabricator.wikimedia.org/r/revision/%R;%H',
        'ssh://(?:[a-z0-9_]+@)?gerrit.wikimedia.org:29418/(.*)' =>
 -              'https://git.wikimedia.org/tree/%r/%H',
 +              'https://phabricator.wikimedia.org/r/revision/%R;%H',
  ];
  
  /** @} */ # End of maintenance }
@@@ -6480,6 -6479,10 +6480,10 @@@ $wgUnwatchedPageThreshold = false
   *   'legend' => 'legend-msg',
   *   // optional (defaults to 'flag'), CSS class to put on changes lists rows
   *   'class' => 'css-class',
+  *   // optional (defaults to 'any'), how top-level flag is determined.  'any'
+  *   // will set the top-level flag if any line contains the flag, 'all' will
+  *   // only be set if all lines contain the flag.
+  *   'grouping' => 'any',
   * );
   * @endcode
   *
@@@ -6490,23 -6493,27 +6494,27 @@@ $wgRecentChangesFlags = 
                'letter' => 'newpageletter',
                'title' => 'recentchanges-label-newpage',
                'legend' => 'recentchanges-legend-newpage',
+               'grouping' => 'any',
        ],
        'minor' => [
                'letter' => 'minoreditletter',
                'title' => 'recentchanges-label-minor',
                'legend' => 'recentchanges-legend-minor',
                'class' => 'minoredit',
+               'grouping' => 'all',
        ],
        'bot' => [
                'letter' => 'boteditletter',
                'title' => 'recentchanges-label-bot',
                'legend' => 'recentchanges-legend-bot',
                'class' => 'botedit',
+               'grouping' => 'all',
        ],
        'unpatrolled' => [
                'letter' => 'unpatrolledletter',
                'title' => 'recentchanges-label-unpatrolled',
                'legend' => 'recentchanges-legend-unpatrolled',
+               'grouping' => 'any',
        ],
  ];
  
@@@ -6546,6 -6553,12 +6554,6 @@@ $wgRightsText = null
   */
  $wgRightsIcon = null;
  
 -/**
 - * Set this to some HTML to override the rights icon with an arbitrary logo
 - * @deprecated since 1.18 Use $wgFooterIcons['copyright']['copyright']
 - */
 -$wgCopyrightIcon = null;
 -
  /**
   * Set this to true if you want detailed copyright information forms on Upload.
   */
@@@ -7185,7 -7198,6 +7193,7 @@@ $wgLogActionsHandlers = 
        'move/move' => 'MoveLogFormatter',
        'move/move_redir' => 'MoveLogFormatter',
        'patrol/patrol' => 'PatrolLogFormatter',
 +      'patrol/autopatrol' => 'PatrolLogFormatter',
        'protect/modify' => 'ProtectLogFormatter',
        'protect/move_prot' => 'ProtectLogFormatter',
        'protect/protect' => 'ProtectLogFormatter',
@@@ -7203,41 -7215,6 +7211,41 @@@
        'upload/upload' => 'UploadLogFormatter',
  ];
  
 +/**
 + * List of log types that can be filtered by action types
 + *
 + * To each action is associated the list of log_action
 + * subtypes to search for, usually one, but not necessarily so
 + * Extensions may append to this array
 + * @since 1.27
 + */
 +$wgActionFilteredLogs = [
 +      'block' => [
 +              'block' => [ 'block' ],
 +              'reblock' => [ 'reblock' ],
 +              'unblock' => [ 'unblock' ],
 +      ],
 +      'delete' => [
 +              'delete' => [ 'delete' ],
 +              'restore' => [ 'restore' ],
 +              'event' => [ 'event' ],
 +              'revision' => [ 'revision' ],
 +      ],
 +      'patrol' => [
 +              'patrol' => [ 'patrol' ],
 +              'autopatrol' => [ 'autopatrol' ],
 +      ],
 +      'protect' => [
 +              'protect' => [ 'protect' ],
 +              'modify' => [ 'modify' ],
 +              'unprotect' => [ 'unprotect' ],
 +      ],
 +      'upload' => [
 +              'upload' => [ 'upload' ],
 +              'overwrite' => [ 'overwrite' ],
 +      ],
 +];
 +
  /**
   * Maintain a log of newusers at Log/newusers?
   */