jenkins-bot has submitted this change and it was merged.
Change subject: Enable GlobalCssJs on all CentralAuth wikis minus loginwiki
......................................................................
Enable GlobalCssJs on all CentralAuth wikis minus loginwiki
This only enables the per-user JS/CSS part of the extension,
site-wide modules are still disabled.
Bug: 13953
Bug: 57891
Change-Id: I9d9809c719364ae01afb0b49dc95c968ac4fc1d8
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
4 files changed, 13 insertions(+), 30 deletions(-)
Approvals:
Anomie: Looks good to me, approved
CSteipp: Looks good to me, but someone else must approve
Deskana: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 252e5dc..1487538 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -109,23 +109,12 @@
require_once( "$IP/extensions/MobileApp/MobileApp.php" );
-// Config for GlobalCssJs
-// Only enable on CentralAuth wikis
+// Labs override for GlobalCssJs
if ( $wmgUseGlobalCssJs && $wmgUseCentralAuth ) {
- require_once( "$IP/extensions/GlobalCssJs/GlobalCssJs.php" );
-
- // Disable site-wide global css/js
- $wgUseGlobalSiteCssJs = false;
-
// Load from betalabs metawiki
$wgResourceLoaderSources['metawiki'] = array(
'apiScript' => '//meta.wikimedia.beta.wmflabs.org/w/api.php',
'loadScript' =>
'//bits.beta.wmflabs.org/meta.wikimedia.beta.wmflabs.org/load.php',
- );
-
- $wgGlobalCssJsConfig = array(
- 'wiki' => 'metawiki',
- 'source' => 'metawiki',
);
}
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index c622acb..69cc477 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1291,23 +1291,21 @@
// Config for GlobalCssJs
// Only enable on CentralAuth wikis
-// Note that config in CommonSettings-labs.php
-// will override this on beta labs-- legoktm 04/17/14
if ( $wmgUseGlobalCssJs && $wmgUseCentralAuth ) {
require_once( "$IP/extensions/GlobalCssJs/GlobalCssJs.php" );
// Disable site-wide global css/js
$wgUseGlobalSiteCssJs = false;
- // Setup test2wiki as central wiki
- $wgResourceLoaderSources['test2wiki'] = array(
- 'apiScript' => '//test2.wikipedia.org/w/api.php',
- 'loadScript' =>
'//bits.wikimedia.org/test2.wikipedia.org/load.php',
+ // Setup metawiki as central wiki
+ $wgResourceLoaderSources['metawiki'] = array(
+ 'apiScript' => '//meta.wikimedia.org/w/api.php',
+ 'loadScript' =>
'//bits.wikimedia.org/meta.wikimedia.org/load.php',
);
$wgGlobalCssJsConfig = array(
- 'wiki' => 'test2wiki',
- 'source' => 'test2wiki',
+ 'wiki' => 'metawiki', // database name
+ 'source' => 'metawiki', // ResourceLoader source name
);
}
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 6b61afe..9ec058d 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -390,13 +390,7 @@
'wmgBug54847' => array(
'default' => false,
),
- # Note this is also guarded with wmgUseCentralAuth
- 'wmgUseGlobalCssJs' => array(
- 'default' => true,
- 'private' => false,
- 'fishbowl' => false,
- 'loginwiki' => false,
- ),
+
'wmgUseGuidedTour' => array(
'wikidatawiki' => true,
),
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 6b61bb4..84e05b3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10066,10 +10066,12 @@
'default' => true,
),
+// This is also guarded by $wmgUseCentralAuth
'wmgUseGlobalCssJs' => array(
- 'default' => false,
- 'testwiki' => true,
- 'test2wiki' => true,
+ 'default' => true,
+ 'loginwiki' => false,
+ 'private' => false,
+ 'fishbowl' => false,
),
'wmgUseOAuth' => array(
--
To view, visit https://gerrit.wikimedia.org/r/154432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d9809c719364ae01afb0b49dc95c968ac4fc1d8
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: CSteipp <cste...@wikimedia.org>
Gerrit-Reviewer: Deskana <dga...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: MF-Warburg <mfwarb...@googlemail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
