[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[wmf/1.30.0-wmf.9]: Give MinervaNeue control of the minerva skin name

2017-07-13 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/364921 )

Change subject: Give MinervaNeue control of the minerva skin name
..


Give MinervaNeue control of the minerva skin name

Change-Id: I7f004b43e11d88492b205a3584c29f72d26bad57
Depends-On: I985c4e3a88b59461d471945ccf74cd291db45a61
Bug: T166748
(cherry picked from commit b0df6367c26d3aee454d0fa1a76ca32244697bcb)
---
M includes/Minerva.hooks.php
M skin.json
2 files changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index ea58ee7..dcb2894 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -11,6 +11,7 @@
  * Hook handler method names should be in the form of:
  * on()
  */
+use MediaWiki\MediaWikiServices;
 
 class MinervaHooks {
/**
@@ -22,8 +23,9 @@
 * @param array &$lessVars Variables already added
 */
public static function onResourceLoaderGetLessVars( &$lessVars ) {
-   // FIXME: Load from Minerva.Config when MobileFrontend and 
Minerva are separated
-   $config = MobileContext::singleton()->getMFConfig();
+   $config = MediaWikiServices::getInstance()->getService( 
'ConfigFactory' )
+   ->makeConfig( 'minerva' );
+
$lessVars = array_merge( $lessVars,
[
'wgMinervaApplyKnownTemplateHacks' => 
"{$config->get( 'MinervaApplyKnownTemplateHacks' )}",
diff --git a/skin.json b/skin.json
index c08d450..addfeff 100644
--- a/skin.json
+++ b/skin.json
@@ -507,7 +507,9 @@
}
},
"ValidSkinNames": {
-   "minerva-neue": "MinervaNeue"
+   "minervaneue": "MinervaNeue",
+   "minerva-neue": "MinervaNeue",
+   "minerva": "Minerva"
},
"author": [],
"config": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f004b43e11d88492b205a3584c29f72d26bad57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: wmf/1.30.0-wmf.9
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[wmf/1.30.0-wmf.9]: Give MinervaNeue control of the minerva skin name

2017-07-12 Thread Chad (Code Review) 
Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/364921 )

Change subject: Give MinervaNeue control of the minerva skin name
..

Give MinervaNeue control of the minerva skin name

Change-Id: I7f004b43e11d88492b205a3584c29f72d26bad57
Depends-On: I985c4e3a88b59461d471945ccf74cd291db45a61
Bug: T166748
(cherry picked from commit b0df6367c26d3aee454d0fa1a76ca32244697bcb)
---
M includes/Minerva.hooks.php
M skin.json
2 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/21/364921/1

diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index ea58ee7..dcb2894 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -11,6 +11,7 @@
  * Hook handler method names should be in the form of:
  * on()
  */
+use MediaWiki\MediaWikiServices;
 
 class MinervaHooks {
/**
@@ -22,8 +23,9 @@
 * @param array &$lessVars Variables already added
 */
public static function onResourceLoaderGetLessVars( &$lessVars ) {
-   // FIXME: Load from Minerva.Config when MobileFrontend and 
Minerva are separated
-   $config = MobileContext::singleton()->getMFConfig();
+   $config = MediaWikiServices::getInstance()->getService( 
'ConfigFactory' )
+   ->makeConfig( 'minerva' );
+
$lessVars = array_merge( $lessVars,
[
'wgMinervaApplyKnownTemplateHacks' => 
"{$config->get( 'MinervaApplyKnownTemplateHacks' )}",
diff --git a/skin.json b/skin.json
index c08d450..addfeff 100644
--- a/skin.json
+++ b/skin.json
@@ -507,7 +507,9 @@
}
},
"ValidSkinNames": {
-   "minerva-neue": "MinervaNeue"
+   "minervaneue": "MinervaNeue",
+   "minerva-neue": "MinervaNeue",
+   "minerva": "Minerva"
},
"author": [],
"config": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f004b43e11d88492b205a3584c29f72d26bad57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: wmf/1.30.0-wmf.9
Gerrit-Owner: Chad 
Gerrit-Reviewer: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits