Merge branch 'main' into proto/mainpage

.github/workflows/mediawiki.verify.yml

@@ -32,3 +32,9 @@ jobs:
       - run: curl -L -s -N "http://site2.localhost:8001/w/api.php" | grep -q "Main module"
       - run: curl -L -s -N "http://site2.localhost:8001/w/load.php" | grep -q "no modules were requested"
       - run: curl -L -s -N "http://site2.localhost:8001/w/rest.php" | grep -q "did not match any known handler"
+
+      - run: curl -L -s -N "http://notfound.localhost:8001/wiki/Main_Page" | grep -q "It may never have existed"
+
+      - run: curl -L -s -N "http://failwith500.localhost:8001/wiki/Main_Page" | grep -q "server error in the platform API"
+
+      - run: curl -L -s -N "http://broken.localhost:8001/wiki/Main_Page" | grep -q "server error in the platform API"

CHANGELOG.md

@@ -2,6 +2,38 @@
 
 Tags have the format: `<MediaWiki core version>-<PHP Version>-<date>-<build number>`
 
+## 1.39-7.4-20240320-0
+- Add flag to enable CirrusSearch prefixing for ids (#434)
+- Add ability to override CirrusSearch's base index name (#433)
+- Move Elasticsearch aliasing out of CirrusSearch (#432)
+
+## 1.39-7.4-20240315-0
+- Support sharing Elasticsearch indices across multiple wikis (#430)
+
+## 1.39-7.4-20240226-0
+- Configure Q1 KELOD research banner #423
+- Add extension DismissableSiteNotice #427
+- Sync resources via pacman #426
+
+## 1.39-7.4-20240207-0
+- Update MediaWiki to 1.39.6 (#417)
+
+## 1.39-7.4-20240202-0
+- Structure logs for Google Cloud Error Reporting (#416)
+- Drop migration patch for Echo (#373)
+
+## 1.39-7.4-20240125-0
+- Load conflicting extensions localisation at cache build time (T354953)
+
+## 1.39-7.4-20240116-0
+- On failure, propagate status code from Platform API to clients (T343744)
+
+## 1.39-7.4-20240103-0
+- Add QuestyCaptcha config option
+
+## 1.39-7.4-20231213-0
+- Set $wgConfirmAccountCaptchas true for ConfirmAccount Wikis
+
 ## 1.39-7.4-20231113-0
 - Do not allow more than 1 replica per Elasticsearch index (#402)
 

README.md

@@ -1,3 +1,5 @@
+> ℹ️ Issues for this repository are tracked on [Phabricator](https://phabricator.wikimedia.org/project/board/5563/) - ([Click here to open a new one](https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?tags=wikibase_cloud,wbstack_mediawiki
+))
 # WBStack MediaWiki modifications
 
 The purposes and features of this repository are:

composer.json

@@ -6,7 +6,7 @@
     "scripts": {
         "lint": [
             "parallel-lint --exclude ./dist --exclude ./sync/.tmp .",
-            "rc=0 && for x in `find . -not -path './sync/.tmp/*' -not -path './dist/*' -name \"*.json\" -type f`; do vendor/bin/jsonlint \"$x\" || rc=$?; done && exit $rc"
+            "rc=0 && for x in `find . -not -path './sync/.tmp/*' -not -path './dist/*' -name \"*.json\" ! -name \"WikiInfo-broken.json\" -type f`; do vendor/bin/jsonlint \"$x\" || rc=$?; done && exit $rc"
             ]
     }
 }