Merge "Add default edit rate limit of 90 edits/minute for all users"

diff --combined includes/DefaultSettings.php
index 0e98e33,c69869c..dcf648e
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -1919,8 -1919,8 +1919,8 @@@ $wgSQLiteDataDir = ''
   * $wgSharedSchema is the table schema for the shared database. It defaults to
   * $wgDBmwschema.
   *
 - * @deprecated since 1.21 In new code, use the $wiki parameter to wfGetLB() to
 - *   access remote databases. Using wfGetLB() allows the shared database to
 + * @deprecated since 1.21 In new code, use the $wiki parameter to LBFactory::getMainLB() to
 + *   access remote databases. Using LBFactory::getMainLB() allows the shared database to
   *   reside on separate servers to the wiki's own database, with suitable
   *   configuration of $wgLBFactoryConf.
   */
@@@ -3237,14 -3237,6 +3237,14 @@@ $wgHTMLFormAllowTableFormat = true
   */
  $wgUseMediaWikiUIEverywhere = false;
  
 +/**
 + * Temporary variable that determines whether the EditPage class should use OOjs UI or not.
 + * This will be removed later and OOjs UI will become the only option.
 + *
 + * @since 1.32
 + */
 +$wgOOUIPreferences = 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
@@@ -3380,12 -3372,23 +3380,12 @@@ $wgApiFrameOptions = 'DENY'
   */
  $wgDisableOutputCompression = false;
  
 -/**
 - * Abandoned experiment with HTML5-style ID escaping. Normalized IDs a bit
 - * too aggressively, breaking preexisting content (particularly Cite).
 - * See T29733, T29694, T29474.
 - *
 - * @deprecated since 1.30, use $wgFragmentMode
 - */
 -$wgExperimentalHtmlIds = false;
 -
  /**
   * How should section IDs be encoded?
   * This array can contain 1 or 2 elements, each of them can be one of:
   * - 'html5'  is modern HTML5 style encoding with minimal escaping. Displays Unicode
   *            characters in most browsers' address bars.
   * - 'legacy' is old MediaWiki-style encoding, e.g. 啤酒 turns into .E5.95.A4.E9.85.92
 - * - 'html5-legacy' corresponds to DEPRECATED $wgExperimentalHtmlIds mode. DO NOT use
 - *            it for anything but migration off that mode (see below).
   *
   * The first element of this array specifies the primary mode of escaping IDs. This
   * is what users will see when they e.g. follow an [[#internal link]] to a section of
@@@ -4281,6 -4284,8 +4281,6 @@@ $wgAllowImageTag = false
   *    - RaggettInternalHHVM: Use the limited-functionality HHVM extension
   *    - RaggettInternalPHP: Use the PECL extension
   *    - RaggettExternal: Shell out to an external binary (tidyBin)
 - *    - Html5Depurate: Use external Depurate service
 - *    - Html5Internal: Use the Balancer library in PHP
   *    - RemexHtml: Use the RemexHtml library in PHP
   *
   *  - tidyConfigFile: Path to configuration file for any of the Raggett drivers
@@@ -5669,6 -5674,7 +5669,7 @@@ $wgRateLimits = 
        'edit' => [
                'ip' => [ 8, 60 ],
                'newbie' => [ 8, 60 ],
+               'user' => [ 90, 60 ],
        ],
        // Page moves
        'move' => [