summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--doc/CHANGELOG1
2 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 94ad6dcd6..d5ae4ff1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source :rubygems
-gem "rails", "2.3.14"
+gem "rails", "2.3.15"
gem "i18n", "~> 0.4.2"
gem "coderay", "~> 1.0.6"
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index e1d60641e..656ab50a4 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -6,6 +6,7 @@ http://www.redmine.org/
== TBD v1.4.6
+* Upgrade to Rails 2.3.15
* Defect #12409: Git: changesets aren't read after clear_changesets call
* Patch #12605: Norwegian translation for 1.4-stable update
* Patch #12614: Dutch translation