From 577bbd08a87ff67697d02ceaefa4773a7fbd09f1 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Mon, 26 Apr 2021 13:43:06 +0000
Subject: [PATCH] Merged r20974 from trunk to 4.2-stable.

git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@20975 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/CHANGELOG          | 67 ++++++++++++++++++++++++++++++++++++++++++
 lib/redmine/version.rb |  2 +-
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 56746bd14..b1e0019f1 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,73 @@ Redmine - project management software
 Copyright (C) 2006-2021  Jean-Philippe Lang
 https://www.redmine.org/
 
+== 2021-04-26 v4.2.1
+
+=== [Accounts / authentication]
+
+* Defect #35087: Users without two-factor authentication enabled cannot sign out when two-factor authentication is required
+* Defect #35135: FrozenError when new LDAP users try to login
+
+=== [Activity view]
+
+* Defect #34933: Atom feed of the activity page does not contain items after the second page
+
+=== [Attachments]
+
+* Defect #34999: The result of Attachment.latest_attach is unstable if attachments have the same timestamp
+
+=== [Custom fields]
+
+* Defect #35115: Time entries are broken if grouped by project and issue custom fields
+
+=== [Email receiving]
+
+* Defect #35100: MailHandler raises NameError exception when generating error message
+
+=== [Gems support]
+
+* Patch #34969: Remove dependency on MimeMagic
+
+=== [Importers]
+
+* Defect #35131: Issue import - allow auto mapping for Unique ID and relation type fields
+
+=== [Issues]
+
+* Defect #34921: Do not journalize attachments that are added during a "Copy Issue" operation
+* Defect #34982: Cannot change the default version and default assignee under settings
+
+=== [Performance]
+
+* Patch #35034: Improve loading speed of workflow page
+
+=== [Rails support]
+
+* Patch #34966: Update Rails to 5.2.5
+
+=== [REST API]
+
+* Defect #35039: API create issue relation method returns undefined method `split' when issue id is sent as integer
+
+=== [Roadmap]
+
+* Defect #34983: Roadmap tab is missing if there are only inherited from parent project versions
+
+=== [Security]
+
+* Defect #34367: Allowed filename extensions of attachments can be circumvented
+* Defect #34950: SysController and MailHandlerController are vulnerable to timing attack
+* Defect #35045: Mail handler bypasses add_issue_notes permission
+* Defect #35085: Arbitrary file read in Git adapter
+
+=== [Text formatting]
+
+* Defect #34894: User link using @ not working at the end of line
+=== [UI]
+
+* Patch #34955: Update copyright year in the footer to 2021
+* Defect #34998: Cannot open journal dropdown menu after editing note
+
 == 2021-03-28 v4.2.0
 
 === [Accounts / authentication]
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 68b6f5597..2814fd2f9 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -7,7 +7,7 @@ module Redmine
   module VERSION
     MAJOR = 4
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     # Branch values:
     # * official release: nil
-- 
2.39.5