Updates for 4.2.6 release.

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 29684554499f24226eadde5dd5084a181497477b..3ecc9d75ff4c7f12135f239d53b4910eef5c0969 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,25 @@ Redmine - project management software
 Copyright (C) 2006-2021  Jean-Philippe Lang
 https://www.redmine.org/
 
+== 2022-05-16 v4.2.6
+
+=== [Attachments]
+
+* Defect #36887: copyImageFromClipboard function failed to generate a unique file name
+* Patch #36817: copyImageFromClipboard function targets the first file input of the page and may conflict with other plugins
+
+=== [Rails support]
+
+* Patch #36918: Update Rails to 5.2.8
+
+=== [Security]
+
+* Patch #36912: Update Nokogiri versions to fix two critical CVE's
+
+=== [Translations]
+
+* Patch #37002: Czech translation update for 4.2-stable
+
 == 2022-03-28 v4.2.5
 
 === [Attachments]

diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 38d3802b872be443ae245743f076780669f55ef6..6c33e1d9e56657b55dd0422e88139fc878686498 100644 (file)
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -7,7 +7,7 @@ module Redmine
   module VERSION
     MAJOR = 4
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
 
     # Branch values:
     # * official release: nil