Follow-up 1cc3a57: Move changes from RELEASE-NOTES-1.28 to 1.29

1.28.0 has already branched and this won't be back-ported.

Change-Id: I1ac1bbc992c665accd3df512eeb6a40ee790ec41

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index f40bcae..58ae23b 100644 (file)
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -56,10 +56,6 @@ production.
   explain your use case(s).
 * New config variable $wgCSPFalsePositiveUrls to control what URLs to ignore
   in upcoming Content-Security-Policy feature's reporting.
-* A new configuration variable has been added: $wgCookieSetOnAutoblock. This
-  determines whether to set a cookie when a user is autoblocked. Doing so means
-  that a blocked user, even after logging out and moving to a new IP address,
-  will still be blocked.
 
 === New features in 1.28 ===
 * User::isBot() method for checking if an account is a bot role account.
@@ -90,8 +86,6 @@ production.
 * Added new hooks, 'ApiQueryBaseBeforeQuery', 'ApiQueryBaseAfterQuery', and
   'ApiQueryBaseProcessRow', to make it easier for extensions to add 'prop' and
   'show' parameters to existing API query modules.
-* (T5233) A cookie can now be set when a user is autoblocked, to track that user if
-  they move to a new IP address. This is disabled by default.
 
 === External library changes in 1.28 ===
 

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 3b65264..3a7cde9 100644 (file)
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -8,8 +8,14 @@ production.
 === Configuration changes in 1.29 ===
 * Default cookie expiration time has been reduced to 30 days. Login cookie expiration time is
   kept at 180 days.
+* A new configuration variable has been added: $wgCookieSetOnAutoblock. This
+  determines whether to set a cookie when a user is autoblocked. Doing so means
+  that a blocked user, even after logging out and moving to a new IP address,
+  will still be blocked.
 
 === New features in 1.29 ===
+* (T5233) A cookie can now be set when a user is autoblocked, to track that user if
+  they move to a new IP address. This is disabled by default.
 
 === External library changes in 1.29 ===