From 18e31ebb45000aa1ab505b9d99bc467c98bf1f21 Mon Sep 17 00:00:00 2001
From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Sun, 1 Aug 2021 06:58:48 +0000
Subject: [PATCH] Updates for 4.2.2 release.

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 71e98947a..34358e940 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,72 @@ Redmine - project management software
 Copyright (C) 2006-2021  Jean-Philippe Lang
 https://www.redmine.org/
 
+== 2021-08-01 v4.2.2
+
+=== [Accounts / authentication]
+
+* Defect #35226: Add SameSite=Lax to cookies to fix warnings in web browsers
+* Patch #35372: Better presentation for 2FA recovery codes
+
+=== [Attachments]
+
+* Defect #33752: Uploading a big file fails with NoMemoryError
+
+=== [Documentation]
+
+* Patch #35375: German translation of wiki syntax help file
+
+=== [Gantt]
+
+* Defect #34694: Progress bar for a shared version on gantt disappears when the tree is collapsed and then expanded
+
+=== [Gems support]
+
+* Defect #35621: Bundler fails to install globalid when using Ruby < 2.6.0
+
+=== [Issues]
+
+* Defect #35134: Change total spent time link to global time entries when issue has subtasks that can be on non descendent projects
+
+=== [Issues filter]
+
+* Defect #35201: Duplicate entries in issue filter values
+
+=== [News]
+
+* Defect #35308: "Add news" button on global news index is displayed for users without permissions
+
+=== [Projects]
+
+* Defect #35606: Locked users should not be displayed in the members box of the project overview page
+
+=== [Rails support]
+
+* Patch #35214: Update Rails to 5.2.6
+
+=== [Text formatting]
+
+* Defect #35036: Markdown text sections broken by thematic breaks (horizontal rules)
+* Defect #35441: Inline image in Textile is not displayed if the image URL contains ampersands
+
+=== [Time tracking]
+
+* Defect #34856: Time entry error on private issue
+
+=== [Translations]
+
+* Defect #35319: Wrong Japanese translation for permission_delete_message_watchers
+* Patch #34979: French translation update for 4.2-stable
+* Patch #35016: French translations for two-factor authentication
+* Patch #35051: German translation update for 4.2-stable
+* Patch #35110: Lithuanian translation update for 4.2-stable
+* Patch #35111: Russian translation update for 4.2-stable
+* Patch #35267: German translation update (jstoolbar-de.js)
+
+=== [Security]
+
+* Defect #35417: User sessions not reset after 2FA activation
+
 == 2021-04-26 v4.2.1
 
 === [Accounts / authentication]
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 2814fd2f9..ee0de0991 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -7,7 +7,7 @@ module Redmine
   module VERSION
     MAJOR = 4
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     # Branch values:
     # * official release: nil
-- 
2.39.5