aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--railties/CHANGELOG2
2 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index a6c2dce569..5e50ce97d2 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Updated to script.aculo.us V1.5.0_rc2 and Prototype to V1.4.0_pre7 [Thomas Fuchs]
+
* Undo condition change made in [2345] to prevent normal parameters arriving as StringIO.
* Tolerate consecutive delimiters in query parameters. #2295 [darashi@gmail.com]
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index b0782ed2d2..049a44015a 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Made Rakefile aware of new .js files in script.aculo.us [Thomas Fuchs]
+
* Make table_name and controller_name in generators honor AR::Base.pluralize_table_names. #1216 #2213 [kazuhiko@fdiary.net]
* Clearly label functional and unit tests in rake stats output. #2297 [lasse.koskela@gmail.com]