Merge "Set migration stage for change tag to read new"

diff --cc includes/DefaultSettings.php
index 2d1681c,6965a15..15cb5bf
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -9031,30 -9013,8 +9031,18 @@@ $wgActorTableSchemaMigrationStage = SCH
   * @since 1.32
   * @var int One of the MIGRATION_* constants
   */
- $wgChangeTagsSchemaMigrationStage = MIGRATION_WRITE_BOTH;
- 
- /**
-  * Temporarily flag to use change_tag_def table as backend of change tag statistics.
-  * For example in case of Special:Tags. If set to false, it will use change_tag table.
-  * Before setting it to true set $wgChangeTagsSchemaMigrationStage to MIGRATION_WRITE_BOTH and run
-  * PopulateChangeTagDef maintaince script.
-  * It's redundant when $wgChangeTagsSchemaMigrationStage is set to MIGRATION_NEW
-  *
-  * @since 1.32
-  * @var bool
-  */
- $wgTagStatisticsNewTable = false;
+ $wgChangeTagsSchemaMigrationStage = MIGRATION_NEW;
  
 +/**
 + * Flag to enable Partial Blocks. This allows an admin to prevent a user from editing specific pages
 + * or namespaces.
 + *
 + * @since 1.32
 + * @deprecated 1.32
 + * @var bool
 + */
 +$wgEnablePartialBlocks = false;
 +
  /**
   * For really cool vim folding this needs to be at the end:
   * vim: foldmarker=@{,@} foldmethod=marker

diff --cc includes/changetags/ChangeTags.php
Simple merge