Updates for 2.0.4 release.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@10393 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index c6ee3bd334430fe3803f1779533c74898a97a57c..96335e5a5515dee492b40090607943bc445b153f 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,28 @@ Redmine - project management software
 Copyright (C) 2006-2012  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 2012-09-16 v2.0.4
+
+* Defect #10818: Running rake in test environment causes exception
+* Defect #11209: Wiki diff may generate broken HTML
+* Defect #11217: Project names in drop-down are escaped twice
+* Defect #11262: Link is escaped in wiki added/updated notification email
+* Defect #11307: Can't filter for negative numeric custom fields
+* Defect #11325: Unified diff link broken on specific file/revision diff view
+* Defect #11341: Escaped link in conflict resolution form
+* Defect #11365: Attachment description length is not validated
+* Defect #11511: Confirmation page has broken HTML when a project folding sub project is deleted
+* Defect #11533: rake redmine:plugins:test doesn't run tests in subdirectories
+* Defect #11541: Version sharing is missing in the REST API
+* Defect #11550: Issue reminder doesn't work when using asynchronous delivery
+* Defect #11776: Can't override mailer views inside redmine plugin.
+* Defect #11789: Edit section links broken with h5/h6 headings
+* Feature #11338: Exclude emails with auto-submitted => auto-generated
+* Patch #11299: redmine:plugins:migrate should update db/schema.rb
+* Patch #11328: Fix Japanese mistranslation for 'label_language_based'
+* Patch #11448: Russian translation for 1.4-stable and 2.0-stable
+* Patch #11600: Fix plural form of the abbreviation for hours in Brazilian Portuguese
+
 == 2012-06-18 v2.0.3
 
 * Defect #10688: PDF export from Wiki - Problems with tables

diff --git a/doc/INSTALL b/doc/INSTALL
index 7021dc67168c7dc78b471f185706e2f5c6a7adc8..34c471d1ef36f9f3650aaf8f9912d57a47fcbf9e 100644 (file)
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -13,7 +13,7 @@ http://www.redmine.org/
 
 * A database:
   * MySQL (tested with MySQL 5.1)
-  * PostgreSQL (tested with PostgreSQL 8.4)
+  * PostgreSQL (tested with PostgreSQL 9.1)
   * SQLite3 (tested with SQLite 3.6)
 
 Optional:
@@ -38,7 +38,10 @@ Optional:
 3. Create an empty utf8 encoded database: "redmine" for example
 
 4. Configure the database parameters in config/database.yml
-   for the "production" environment (default database is MySQL)
+   for the "production" environment (default database is MySQL and ruby1.8)
+
+   If you're running Redmine with MySQL and ruby1.9, replace the adapter name
+   with `mysql2`
 
 5. Generate a session store secret
    

diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 9dd157a78f3ffcbe8d0fc5198d607d02eb380316..115a733c2d70503f5de1d46873d02deb18cfb1cf 100644 (file)
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     # Branch values:
     # * official release: nil