Reedy has uploaded a new change for review.

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

Change subject: Revert ZeroBanner to manifest_version 1
......................................................................

Revert ZeroBanner to manifest_version 1

Bug: T149759
Change-Id: I01393d4b6711fcaa6eea8ecf29fd5c19e73dc8d0
---
M extension.json
1 file changed, 17 insertions(+), 44 deletions(-)


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

diff --git a/extension.json b/extension.json
index 64248b7..17a58ac 100644
--- a/extension.json
+++ b/extension.json
@@ -136,59 +136,32 @@
        },
        "config": {
                "JsonConfigModels": {
-                       "merge_strategy": "array_replace_recursive",
-                       "value": {
-                               "JsonZeroConfig": {
-                                       "class": "ZeroBanner\\ZeroConfig"
-                               }
+                       "_merge_strategy": "array_replace_recursive",
+                       "JsonZeroConfig": {
+                               "class": "ZeroBanner\\ZeroConfig"
                        }
                },
                "JsonConfigs": {
-                       "merge_strategy": "array_replace_recursive",
-                       "value": {
-                               "JsonZeroConfig": {
-                                       "namespace": 480,
-                                       "nsName": "Zero",
-                                       "isLocal": false,
-                                       "cacheKey": "1"
-                               }
+                       "_merge_strategy": "array_replace_recursive",
+                       "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.",
-                       "@note3": "ZeroBanner explicitly checks for the site to 
equal 'wikipedia' before enabling Zero.",
-                       "value": false
-               },
-               "ZeroBannerClusterDomain": {
-                       "@note": "string Temporary workaround - until I figure 
out how to calculate it",
-                       "value": "org"
-               },
-               "ZeroBannerImageFontSize": {
-                       "@note": "int size of the font used for the image",
-                       "value": 14
-               },
-               "ZeroBannerImageWidth": {
-                       "@note": "int size of the image banner width",
-                       "value": 320
-               },
-               "ZeroBannerImageHeight": {
-                       "@note": "int size of the image banner width",
-                       "value": 28
-               },
-               "ZeroBannerErrImageWidth": {
-                       "@note": "int size of the error image width",
-                       "value": 320
-               },
-               "ZeroBannerErrImageHeight": {
-                       "@note": "int size of the error image width",
-                       "value": 200
-               },
+               "ZeroSiteOverride": false,
+               "ZeroBannerClusterDomain": "org",
+               "ZeroBannerImageFontSize": 14,
+               "ZeroBannerImageWidth": 320,
+               "ZeroBannerImageHeight": 28,
+               "ZeroBannerErrImageWidth": 320,
+               "ZeroBannerErrImageHeight": 200,
                "ZeroBannerFont": {
                        "value": "unifont/unifont_csur-7.0.03.ttf",
                        "path": true
                }
        },
        "load_composer_autoloader": true,
-       "manifest_version": 2
+       "manifest_version": 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01393d4b6711fcaa6eea8ecf29fd5c19e73dc8d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: REL1_28
Gerrit-Owner: Reedy <re...@wikimedia.org>

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

Reply via email to