jenkins-bot has submitted this change and it was merged. Change subject: Use /api/rest_v1/ entry point for VE, take two. ......................................................................
Use /api/rest_v1/ entry point for VE, take two. The first attempt had to be rolled back when we discovered that the text Varnishes decoded %2f to literal slashes, which broke RESTBase requests for subpages / titles containing slashes. This was fixed in https://gerrit.wikimedia.org/r/#/c/206345/ by disabling the decoding for requests to /api/rest_v1/. This patch re-applies I7ddf22d8c552473f848. This reverts commit 58fe5c179ff08ae3760f91ca2b8145f4f6df72de. Change-Id: If99be4cdf0fff900ef0f8a05d806448762bca27f --- M wmf-config/CommonSettings-labs.php M wmf-config/CommonSettings.php 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Catrope: Looks good to me, approved Jforrester: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index 9873c86..55f86fc 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -104,7 +104,7 @@ // so use a hook $wgExtensionFunctions[] = function () { global $wgServerName, $wgVisualEditorRestbaseURL; - $wgVisualEditorRestbaseURL = "https://restbase-beta.wmflabs.org/$wgServerName/v1/page/html/";; + $wgVisualEditorRestbaseURL = "https://$wgServerName/api/rest_v1/page/html/";; }; } } diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index f5727ff..18efed9 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2046,7 +2046,7 @@ // so use a hook $wgExtensionFunctions[] = function () { global $wgServerName, $wgVisualEditorRestbaseURL; - $wgVisualEditorRestbaseURL = "https://rest.wikimedia.org/$wgServerName/v1/page/html/";; + $wgVisualEditorRestbaseURL = "https://$wgServerName/api/rest_v1/page/html/";; }; } -- To view, visit https://gerrit.wikimedia.org/r/206502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If99be4cdf0fff900ef0f8a05d806448762bca27f Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: GWicke <gwi...@wikimedia.org> Gerrit-Reviewer: Catrope <roan.katt...@gmail.com> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
