Merge "Add support for image interlacing of Bitmap type images"

diff --combined includes/DefaultSettings.php
index 00a5709,f831cfa..4d0b50e
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -661,6 -661,12 +661,6 @@@ $wgCacheSharedUploads = true
   */
  $wgAllowCopyUploads = false;
  
 -/**
 - * Allow asynchronous copy uploads.
 - * This feature is experimental and broken as of r81612.
 - */
 -$wgAllowAsyncCopyUploads = false;
 -
  /**
   * A list of domains copy uploads can come from
   *
@@@ -691,6 -697,17 +691,6 @@@ $wgCopyUploadProxy = false
   */
  $wgCopyUploadTimeout = false;
  
 -/**
 - * Different timeout for upload by url when run as a background job
 - * This could be useful since when fetching large files via job queue,
 - * you may want a different timeout, especially because there is no
 - * http request being kept alive.
 - *
 - * false means fallback to $wgCopyUploadTimeout.
 - * @since 1.22
 - */
 -$wgCopyUploadAsyncTimeout = false;
 -
  /**
   * Max size for uploads, in bytes. If not set to an array, applies to all
   * uploads. If set to an array, per upload type maximums can be set, using the
@@@ -943,6 -960,12 +943,12 @@@ $wgUseImageMagick = false
   */
  $wgImageMagickConvertCommand = '/usr/bin/convert';
  
+ /**
+  * Array of max pixel areas for interlacing per MIME type
+  * @since 1.27
+  */
+ $wgMaxInterlacingAreas = array();
+ 
  /**
   * Sharpening parameter to ImageMagick
   */
@@@ -3688,15 -3711,7 +3694,15 @@@ $wgResourceLoaderValidateStaticJS = fal
   * @endcode
   * @since 1.22
   */
 -$wgResourceLoaderLESSVars = array();
 +$wgResourceLoaderLESSVars = array(
 +      /**
 +       * Minimum available screen width at which a device can be considered a tablet/desktop
 +       * 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
 +       */
 +      'deviceWidthTablet' => '720px',
 +);
  
  /**
   * Default import paths for LESS modules. LESS files referenced in @import
@@@ -5410,8 -5425,6 +5416,8 @@@ $wgGrantPermissions['highvolume']['mark
  
  $wgGrantPermissions['editpage']['edit'] = true;
  $wgGrantPermissions['editpage']['minoredit'] = true;
 +$wgGrantPermissions['editpage']['applychangetags'] = true;
 +$wgGrantPermissions['editpage']['changetags'] = true;
  
  $wgGrantPermissions['editprotected'] = $wgGrantPermissions['editpage'];
  $wgGrantPermissions['editprotected']['editprotected'] = true;
@@@ -5433,7 -5446,6 +5439,7 @@@ $wgGrantPermissions['createeditmovepage
  $wgGrantPermissions['createeditmovepage']['move'] = true;
  $wgGrantPermissions['createeditmovepage']['move-rootuserpages'] = true;
  $wgGrantPermissions['createeditmovepage']['move-subpages'] = true;
 +$wgGrantPermissions['createeditmovepage']['move-categorypages'] = true;
  
  $wgGrantPermissions['uploadfile']['upload'] = true;
  $wgGrantPermissions['uploadfile']['reupload-own'] = true;
@@@ -6899,6 -6911,7 +6905,6 @@@ $wgJobClasses = array
        'sendMail' => 'EmaillingJob',
        'enotifNotify' => 'EnotifNotifyJob',
        'fixDoubleRedirect' => 'DoubleRedirectJob',
 -      'uploadFromUrl' => 'UploadFromUrlJob',
        'AssembleUploadChunks' => 'AssembleUploadChunksJob',
        'PublishStashedFile' => 'PublishStashedFileJob',
        'ThumbnailRender' => 'ThumbnailRenderJob',