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

Change subject: Move "SpecialSearchResultsPrepend" note back to 1.21
......................................................................


Move "SpecialSearchResultsPrepend" note back to 1.21

Partial revert of I6a51e3ee: the hooks were actually added
before the branch point (in Ib3843314), not in I226349aa, which
merely added the release note.

The author of I226349aa has already backported the change.

Change-Id: Ifc2728133c6ca52ef866ce963c28bd3d06eab05a
---
M RELEASE-NOTES-1.21
M RELEASE-NOTES-1.22
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 6c68d82..1930636 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -115,6 +115,7 @@
   uz, vi.
 * Added 'CategoryAfterPageAdded' and 'CategoryAfterPageRemoved' hooks.
 * Added 'HistoryRevisionTools' and 'DiffRevisionTools' hooks.
+* Added 'SpecialSearchResultsPrepend' and 'SpecialSearchResultsAppend' hooks.
 * (bug 33186) Add image rotation api "imagerotate"
 * (bug 34040) Add "User rights management" link on user page toolbox.
 * (bug 45526) Add QUnit assertion helper "QUnit.assert.htmlEqual" for asserting
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index d3ea77e..bc1d5b7 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -26,7 +26,6 @@
   version of the Vector extension as this feature may conflict.
 * New version of Special:UserLogin form. It is opt-in for now, controlled by
   the $wgUseVFormUserLogin setting or a 'useNew' URL parameter trigger.
-* Added 'SpecialSearchResultsPrepend' and 'SpecialSearchResultsAppend' hooks.
 * (bug 23343) Implemented ability to apply IP blocks to the contents of 
X-Forwarded-For headers
   by adding a new configuration variable $wgApplyIpBlocksToXff (disabled by 
default).
 * The new hook 'APIGetPossibleErrors' to modify the list of possible errors was

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc2728133c6ca52ef866ce963c28bd3d06eab05a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <[email protected]>
Gerrit-Reviewer: Fo0bar <[email protected]>
Gerrit-Reviewer: IAlex <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to