jenkins-bot has submitted this change and it was merged. Change subject: Revert "Autopromotion: remove deprecated onView event, fix INGROUPS" ......................................................................
Revert "Autopromotion: remove deprecated onView event, fix INGROUPS" This reverts commit 0247a7f6ef58a7ea6132dea47aa1f1044a15b870. Coincides with a spike of needs_token: https://grafana.wikimedia.org/dashboard/db/authentication-metrics?from=1453924117697&to=1454010517698&var-entrypoint=* Change-Id: Iea2573ccfbea047899a1fd3ba312c729f46cc0ee --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 23 insertions(+), 20 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 2003db6..7574b43 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1038,6 +1038,7 @@ $wgAutopromoteOnce = array( 'onEdit' => $wmgAutopromoteOnceonEdit, + 'onView' => $wmgAutopromoteOnceonView, ); if ( is_array( $wmgExtraImplicitGroups ) ) { diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5398226..9189df8 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11182,53 +11182,55 @@ array( APCOND_EDITCOUNT, 200 ), ), ), // T67495 - 'fawiki' => array( - 'uploader' => array( '&', - array( APCOND_AGE, 4 * 86400 ), - array( APCOND_EDITCOUNT, 10 ), - array( '!', array( APCOND_INGROUPS, 'sysop' ) ), - array( '!', array( APCOND_INGROUPS, 'bureaucrat' ) ), - ), - ), // T71171 'trwiki' => array( 'autoreview' => array( '&', // AND array( APCOND_AGE, 7*86400 ), - array( APCOND_EDITCOUNT, 30 ), - // autopromote conditions handled by FlaggedRevs (constants not yet defined): + array( APCOND_EDITCOUNT, 30, 2*86400 ), array( 70821 /*APCOND_FR_EDITSUMMARYCOUNT*/, 5 ), array( 70823 /*APCOND_FR_UNIQUEPAGECOUNT*/, 5 ), array( 70827 /*APCOND_FR_EDITSPACING*/, 7, 7 ), array( 70824 /*APCOND_FR_CONTENTEDITCOUNT*/, 20, 2*86400 ), array( 70822 /*APCOND_FR_NEVERBOCKED*/ ), array( 70829 /*APCOND_FR_MAXREVERTEDEDITRATIO*/, .03 ), - array( '!', array( APCOND_INGROUPS, 'sysop' ) ), - array( '!', array( APCOND_INGROUPS, 'bureaucrat' ) ), - array( '!', array( APCOND_INGROUPS, 'bot' ) ), - array( '!', array( APCOND_INGROUPS, 'patroller' ) ), + array( '!', array( APCOND_INGROUPS, array( 'sysop' ) ) ), + array( '!', array( APCOND_INGROUPS, array( 'bureaucrat' ) ) ), + array( '!', array( APCOND_INGROUPS, array( 'bot' ) ) ), + array( '!', array( APCOND_INGROUPS, array( 'patroller' ) ) ), ), 'patroller' => array( '&', // AND array( APCOND_AGE, 15*86400 ), - array( APCOND_EDITCOUNT, 150 ), - // autopromote conditions handled by FlaggedRevs (constants not yet defined): + array( APCOND_EDITCOUNT, 150, 1*86400 ), array( 70821 /*APCOND_FR_EDITSUMMARYCOUNT*/, 25 ), array( 70823 /*APCOND_FR_UNIQUEPAGECOUNT*/, 10 ), array( 70827 /*APCOND_FR_EDITSPACING*/, 7, 15 ), array( 70824 /*APCOND_FR_CONTENTEDITCOUNT*/, 100, 1*86400 ), array( 70822 /*APCOND_FR_NEVERBOCKED*/ ), array( 70829 /*APCOND_FR_MAXREVERTEDEDITRATIO*/, .03 ), - array( '!', array( APCOND_INGROUPS, 'sysop' ) ), - array( '!', array( APCOND_INGROUPS, 'bureaucrat' ) ), - array( '!', array( APCOND_INGROUPS, 'bot' ) ), + array( '!', array( APCOND_INGROUPS, array( 'sysop' ) ) ), + array( '!', array( APCOND_INGROUPS, array( 'bureaucrat' ) ) ), + array( '!', array( APCOND_INGROUPS, array( 'bot' ) ) ), ), ), +), + +'wmgAutopromoteOnceonView' => array( + 'default' => array(), 'ruwiki' => array( 'uploader' => array( '&', - array( APCOND_AGE, 14 * 86400 ), array( APCOND_EDITCOUNT, 20 ), + array( APCOND_AGE, 14 * 86400 ), ), ), + 'fawiki' => array( + 'uploader' => array( '&', + array( APCOND_EDITCOUNT, 10 ), + array( APCOND_AGE, 4 * 86400 ), + array( '!', array( APCOND_INGROUPS, array( 'sysop' ) ) ), + array( '!', array( APCOND_INGROUPS, array( 'bureaucrat' ) ) ), + ), + ), // T71171 ), 'wgAutopromoteOnceLogInRC' => array( -- To view, visit https://gerrit.wikimedia.org/r/267072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea2573ccfbea047899a1fd3ba312c729f46cc0ee Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
