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

Change subject: Define a merge strategy for JsonConfigs
......................................................................


Define a merge strategy for JsonConfigs

Change-Id: Iafe00d370a5a78c469cf98ae0b2628239da025dd
---
M extension.json
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 43afcd2..076cfc1 100644
--- a/extension.json
+++ b/extension.json
@@ -119,7 +119,9 @@
                ]
        },
        "config": {
-               "JsonConfigs": [],
+               "JsonConfigs": {
+                       "_merge_strategy": "array_merge_recursive"
+               },
                "JsonConfigModels": [],
                "JsonConfigDisableCache": false,
                "JsonConfigCacheKeyPrefix": "1",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafe00d370a5a78c469cf98ae0b2628239da025dd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/JsonConfig
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to