From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 14 Nov 2018 16:28:34 +0000 (+0000)
Subject: Merge "Set migration stage for change tag to read new"
X-Git-Tag: 1.34.0-rc.0~3514
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%7B%7B%20url_for%28%27vote%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=65f12f7190442dcea96eb8d642ebbf8c39df1427;p=lhc%2Fweb%2Fwiklou.git

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

65f12f7190442dcea96eb8d642ebbf8c39df1427
diff --cc includes/DefaultSettings.php
index 2d1681cc3e,6965a15cfe..15cb5bf3e3
--- a/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