jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362394 )
Change subject: Enable Newsletter on testwiki ...................................................................... Enable Newsletter on testwiki Bug: T110170 Change-Id: I1045e70cc2401e4c565ecf768ef70f299dfc8090 --- M wmf-config/CommonSettings-labs.php M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 3 files changed, 9 insertions(+), 4 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index 71eff0e..59ff02c 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -308,10 +308,6 @@ $wgOresBaseUrl = 'https://ores-beta.wmflabs.org/'; } -if ( $wmgUseNewsletter ) { - wfLoadExtension( 'Newsletter' ); -} - if ( $wmgUsePerformanceInspector ) { wfLoadExtension( 'PerformanceInspector' ); } diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 32e6f83..ae72c43 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -3386,6 +3386,10 @@ } } +if ( $wmgUseNewsletter ) { + wfLoadExtension( 'Newsletter' ); +} + ### End (roughly) of general extensions ######################## $wgApplyIpBlocksToXff = true; diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index b5c4879..0fe874d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19330,6 +19330,11 @@ 'foundationwiki' => true, ], +'wmgUseNewsletter' => [ + 'default' => false, + 'testwiki' => true, // T110170 +], + // Enable LoginNotify on testwiki (T165007) 'wmgUseLoginNotify' => [ 'default' => false, -- To view, visit https://gerrit.wikimedia.org/r/362394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1045e70cc2401e4c565ecf768ef70f299dfc8090 Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits