jenkins-bot has submitted this change and it was merged.

Change subject: Add three Multimedia extensions to config, enable on testwiki 
and test2wiki
......................................................................


Add three Multimedia extensions to config, enable on testwiki and test2wiki

Revert "Revert "Add three Multimedia extensions to config""

This reverts commit 6315b3a32fd91fff49cb4578e78c811e2c78400d.

Change-Id: I1e0fe1a0bea4dd6cb3b286a6f6ce5342f259c85b
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 30 insertions(+), 0 deletions(-)

Approvals:
  MarkTraceur: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ae9683a..e96d9d3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1873,6 +1873,18 @@
        $wgApiFrameOptions = $wmgApiFrameOptions;
 }
 
+if ( $wmgUseBetaFeatures ) {
+       require_once( "$IP/extensions/BetaFeatures/BetaFeatures.php" );
+}
+
+if ( $wmgUseCommonsMetadata ) {
+       require_once( "$IP/extensions/CommonsMetadata/CommonsMetadata.php" );
+}
+
+if ( $wmgUseMultimediaViewer ) {
+       require_once( "$IP/extensions/MultimediaViewer/MultimediaViewer.php" );
+}
+
 if ( $wmgUseVisualEditor ) {
        require_once( "$IP/extensions/VisualEditor/VisualEditor.php" );
        $wgVisualEditorParsoidURL = 'http://10.2.2.29'; // 
parsoidcache.svc.eqiad.wmnet
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cb2c1ca..529e6fd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10563,6 +10563,24 @@
        'default' => 800,
 ),
 
+'wmgUseBetaFeatures' => array(
+       'default' => false,
+       'testwiki' => true,
+       'test2wiki' => true,
+),
+
+'wmgUseCommonsMetadata' => array(
+       'default' => false,
+       'testwiki' => true,
+       'test2wiki' => true,
+),
+
+'wmgUseMultimediaViewer' => array(
+       'default' => false,
+       'testwiki' => true,
+       'test2wiki' => true,
+),
+
 // -------------- VisualEditor start --------------
 
 'wmgUseVisualEditor' => array(

-- 
To view, visit https://gerrit.wikimedia.org/r/93091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e0fe1a0bea4dd6cb3b286a6f6ce5342f259c85b
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to