From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 23 Feb 2018 22:59:29 +0000 (+0000)
Subject: Merge "wgGroupPermissions: Don't grant editmyusercss/editmyuserjs to anons"
X-Git-Tag: 1.31.0-rc.0~516
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=1964f24bb466fa0c8c30d075a1e7ef94a84593f9;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "wgGroupPermissions: Don't grant editmyusercss/editmyuserjs to anons"
---

1964f24bb466fa0c8c30d075a1e7ef94a84593f9
diff --combined includes/DefaultSettings.php
index 2fa071029b,a54f4cf9ca..33418d839c
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -5127,8 -5127,6 +5127,6 @@@ $wgGroupPermissions['*']['edit'] = true
  $wgGroupPermissions['*']['createpage'] = true;
  $wgGroupPermissions['*']['createtalk'] = true;
  $wgGroupPermissions['*']['writeapi'] = true;
- $wgGroupPermissions['*']['editmyusercss'] = true;
- $wgGroupPermissions['*']['editmyuserjs'] = true;
  $wgGroupPermissions['*']['viewmywatchlist'] = true;
  $wgGroupPermissions['*']['editmywatchlist'] = true;
  $wgGroupPermissions['*']['viewmyprivateinfo'] = true;
@@@ -5151,6 -5149,8 +5149,8 @@@ $wgGroupPermissions['user']['upload'] 
  $wgGroupPermissions['user']['reupload'] = true;
  $wgGroupPermissions['user']['reupload-shared'] = true;
  $wgGroupPermissions['user']['minoredit'] = true;
+ $wgGroupPermissions['user']['editmyusercss'] = true;
+ $wgGroupPermissions['user']['editmyuserjs'] = true;
  $wgGroupPermissions['user']['purge'] = true;
  $wgGroupPermissions['user']['sendemail'] = true;
  $wgGroupPermissions['user']['applychangetags'] = true;
@@@ -8830,13 -8830,6 +8830,13 @@@ $wgInterwikiPrefixDisplayTypes = []
   */
  $wgCommentTableSchemaMigrationStage = MIGRATION_OLD;
  
 +/**
 + * Actor table schema migration stage.
 + * @since 1.31
 + * @var int One of the MIGRATION_* constants
 + */
 +$wgActorTableSchemaMigrationStage = MIGRATION_OLD;
 +
  /**
   * For really cool vim folding this needs to be at the end:
   * vim: foldmarker=@{,@} foldmethod=marker