Merged r19396 to 4.0-stable.

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

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index dbf20107463dc5cf6d1cd0e3828a2ae48918981e..1715180a2c6e885d2927a45756076d1f19d053bf 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,29 @@ Redmine - project management software
 Copyright (C) 2006-2017  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2019-12-20 v4.0.6
+
+=== [Attachments]
+
+* Defect #20277: "Couldn't find template for digesting" error in the log when sending a thumbnail or an attachment
+
+=== [Gems support]
+
+* Patch #32592: Require 'mocha/minitest' instead of deprecated 'mocha/setup'
+
+=== [Rails support]
+
+* Feature #32526: Update Rails to 5.2.4.1
+
+=== [Text formatting]
+
+* Defect #32422: Textile indentation does not work in the preview tab
+* Patch #25742: Improper markup sanitization in user content for space separated attribute values and different quoting styles
+
+=== [Time tracking]
+
+* Defect #32500: Spent time report csv shows translation missing text if custom fields are involved
+
 == 2019-10-19 v4.0.5
 
 === [Code cleanup/refactoring]

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