Merged r21430 to 4.2-stable.

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 240788b5ff23e11fef7b5a10de5b9a459daa0f86..0ce077de8c91c2bf4f35ae5591fdd95e43a7114a 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,51 @@ Redmine - project management software
 Copyright (C) 2006-2021  Jean-Philippe Lang
 https://www.redmine.org/
 
+== 2022-02-20 v4.2.4
+
+=== [Gantt]
+
+* Defect #35027: Gantt PNG export ignores imagemagick_convert_command
+
+=== [Gems support]
+
+* Defect #35435: Psych 4: aliases in database.yml cause Psych::BadAlias exception
+* Defect #36226: Psych 4: Psych::DisallowedClass exception when unserializing a setting value
+
+=== [Importers]
+
+* Defect #35656: When importing issue relations, the validation messages are not shown in the UI
+
+=== [Issues]
+
+* Defect #36455: Text custom field values are not aligned with their labels when text formatting is enabled
+
+=== [Rails support]
+
+* Patch #36633: Update Rails to 5.2.6.2
+
+=== [Time tracking]
+
+* Defect #20018: Duplicate activities in time entry report when project-specific activies exist
+* Defect #36248: Time entries of sub-projects are not listed when activity is specified in filters
+
+=== [Translations]
+
+* Defect #36517: Label error_can_not_execute_macro_html in Russian translation is broken
+
+=== [UI]
+
+* Defect #36446: Watchers autocomplete fails with 403 error when the search is made from multiple objects with different projects
+* Patch #35215: Don't display "No Match Found!" when the inline autocomplete doesn't return any result
+* Defect #35090: Permission check of the setting button on the issues page mismatches button semantics
+* Defect #36363: Cannot select text in a table with a context menu available
+* Patch #36378: Update copyright year in the footer to 2022
+
+=== [Wiki]
+
+* Defect #36494: WikiContentVersion API returns 500 if author is nil
+* Defect #36561: Wiki revision page does not return 404 if revision does not exist
+
 == 2021-10-10 v4.2.3
 
 === [Administration]

diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 0e6c80a4663351825341b75a1a31d467e1c5759d..9cba170d5df5cd1c6dc76e003acddad9e4c2925e 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  = 3
+    TINY  = 4
 
     # Branch values:
     # * official release: nil