Updates for 4.2.11 release4.2-stable

git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@22324 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 47 insertions, 1 deletions

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index cf80b1cc2..832416616 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,52 @@ Redmine - project management software
 Copyright (C) 2006-2023  Jean-Philippe Lang
 https://www.redmine.org/
 
+== 2023-09-30 v4.2.11
+
+=== [Code cleanup/refactoring]
+
+* Defect #38797: Fix incorrect argument format for assert_select
+
+=== [Custom fields]
+
+* Defect #38464: Rendering a custom field with a URL pattern set and containing " :" in the value raises Addressable::URI::InvalidURIError
+
+=== [Gantt]
+
+* Defect #38728: Correctly escape issue text in Gantt PNG export for ImageMagick convert
+
+=== [Gems support]
+
+* Patch #39070: Allow using the latest version of mocha even when using Ruby < 2.7
+
+=== [Ruby support]
+
+* Defect #38617: Redmine 4.2 on Ruby 2.4 is not compatible with loofah 2.21 or higher
+
+=== [Security]
+
+* Defect #38539: Update Nokogiri to 1.15.2 in 5.0-stable and 4.2-stable
+* Defect #38807: XSS in Textile formatter
+* Defect #38806: XSS in Markdown formatter
+* Defect #38417: XSS Vulnerability in Thumbnails
+
+=== [Text formatting]
+
+* Defect #38697: Exception during thumbnail macro to image tag conversion in emails
+
+=== [Time tracking]
+
+* Defect #39079: NoMethodError when trying to remove the date of an existing time entry
+
+=== [Translations]
+
+* Defect #38507: Fix typo in French translation of setting_bulk_download_max_size
+
+=== [UI]
+
+* Defect #33502: Issue field labels for fields with descriptions are missing styling on issues show view
+* Defect #38448: The margin below the Submit button on the issue edit page is too narrow
+
 == 2023-03-05 v4.2.10
 
 === [Code cleanup/refactoring]
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 5b11f1956..d1986ba31 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -7,7 +7,7 @@ module Redmine
   module VERSION
     MAJOR = 4
     MINOR = 2
-    TINY  = 10
+    TINY  = 11
 
     # Branch values:
     # * official release: nil