[MediaWiki-commits] [Gerrit] mediawiki...ZeroBanner[wmf/1.29.0-wmf.1]: Revert "Fixed JsonConfigs global var initialization"

2016-11-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Fixed JsonConfigs global var initialization"
..


Revert "Fixed JsonConfigs global var initialization"

This reverts commit 03e5d41f89ffcb0584a0f21613165d4967e8eb67.

Change-Id: Id9eec10564b8a4972f14dd5cddbb5174890f7aac
(cherry picked from commit 347fa6c6799c35117acf0e3170edbdcb3660d5b9)
---
M extension.json
1 file changed, 13 insertions(+), 19 deletions(-)

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



diff --git a/extension.json b/extension.json
index 64248b7..a50f8ac 100644
--- a/extension.json
+++ b/extension.json
@@ -134,26 +134,20 @@
"SpecialMobileEditWatchlist::images": 
"ZeroBanner\\PageRenderingHooks::onSpecialMobileEditWatchlist_images",
"ResourceLoaderTestModules": 
"ZeroBanner\\TestHooks::onResourceLoaderTestModules"
},
+   "JsonConfigModels": {
+   "JsonZeroConfig": {
+   "class": "ZeroBanner\\ZeroConfig"
+   }
+   },
+   "JsonConfigs": {
+   "JsonZeroConfig": {
+   "namespace": 480,
+   "nsName": "Zero",
+   "isLocal": false,
+   "cacheKey": "1"
+   }
+   },
"config": {
-   "JsonConfigModels": {
-   "merge_strategy": "array_replace_recursive",
-   "value": {
-   "JsonZeroConfig": {
-   "class": "ZeroBanner\\ZeroConfig"
-   }
-   }
-   },
-   "JsonConfigs": {
-   "merge_strategy": "array_replace_recursive",
-   "value": {
-   "JsonZeroConfig": {
-   "namespace": 480,
-   "nsName": "Zero",
-   "isLocal": false,
-   "cacheKey": "1"
-   }
-   }
-   },
"ZeroSiteOverride": {
"@note": "false|string[] For testing, overrides 
Conf->siteFromDB( DBname )",
"@note2": "On a test wiki, set it to ['wikipedia','en'] 
or similar.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9eec10564b8a4972f14dd5cddbb5174890f7aac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: wmf/1.29.0-wmf.1
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Hashar 
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...ZeroBanner[wmf/1.29.0-wmf.1]: Revert "Fixed JsonConfigs global var initialization"

2016-11-02 Thread Yurik (Code Review) 
Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/319272

Change subject: Revert "Fixed JsonConfigs global var initialization"
..

Revert "Fixed JsonConfigs global var initialization"

This reverts commit 03e5d41f89ffcb0584a0f21613165d4967e8eb67.

Change-Id: Id9eec10564b8a4972f14dd5cddbb5174890f7aac
(cherry picked from commit 347fa6c6799c35117acf0e3170edbdcb3660d5b9)
---
M extension.json
1 file changed, 13 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroBanner 
refs/changes/72/319272/1

diff --git a/extension.json b/extension.json
index 64248b7..a50f8ac 100644
--- a/extension.json
+++ b/extension.json
@@ -134,26 +134,20 @@
"SpecialMobileEditWatchlist::images": 
"ZeroBanner\\PageRenderingHooks::onSpecialMobileEditWatchlist_images",
"ResourceLoaderTestModules": 
"ZeroBanner\\TestHooks::onResourceLoaderTestModules"
},
+   "JsonConfigModels": {
+   "JsonZeroConfig": {
+   "class": "ZeroBanner\\ZeroConfig"
+   }
+   },
+   "JsonConfigs": {
+   "JsonZeroConfig": {
+   "namespace": 480,
+   "nsName": "Zero",
+   "isLocal": false,
+   "cacheKey": "1"
+   }
+   },
"config": {
-   "JsonConfigModels": {
-   "merge_strategy": "array_replace_recursive",
-   "value": {
-   "JsonZeroConfig": {
-   "class": "ZeroBanner\\ZeroConfig"
-   }
-   }
-   },
-   "JsonConfigs": {
-   "merge_strategy": "array_replace_recursive",
-   "value": {
-   "JsonZeroConfig": {
-   "namespace": 480,
-   "nsName": "Zero",
-   "isLocal": false,
-   "cacheKey": "1"
-   }
-   }
-   },
"ZeroSiteOverride": {
"@note": "false|string[] For testing, overrides 
Conf->siteFromDB( DBname )",
"@note2": "On a test wiki, set it to ['wikipedia','en'] 
or similar.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9eec10564b8a4972f14dd5cddbb5174890f7aac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: wmf/1.29.0-wmf.1
Gerrit-Owner: Yurik 

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