Merge "extension.json: 1st dimension is namespace ID, so avoid re-numbering"

This commit is contained in:
jenkins-bot 2016-08-29 17:23:24 +00:00 committed by Gerrit Code Review
commit 77d3872753

View file

@ -95,7 +95,9 @@
"badloginperuser": true, "badloginperuser": true,
"_merge_strategy": "array_plus" "_merge_strategy": "array_plus"
}, },
"wgCaptchaTriggersOnNamespace": [], "wgCaptchaTriggersOnNamespace": {
"_merge_strategy": "array_plus_2d"
},
"wgCaptchaStorageClass": "CaptchaSessionStore", "wgCaptchaStorageClass": "CaptchaSessionStore",
"wgCaptchaSessionExpiration": 1800, "wgCaptchaSessionExpiration": 1800,
"wgCaptchaBadLoginExpiration": 300, "wgCaptchaBadLoginExpiration": 300,