aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-10-06 01:26:48 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-10-06 01:26:48 +0000
commitfe0df25f7b4e60cf7d98c5c6a640873d399f45d5 (patch)
tree7d28918c2f6a8ba9692f0f672bf497052e2e1a37
parent8ef4bc6c75a0e077e438d3ed1d251432043d0fb6 (diff)
downloadrails-fe0df25f7b4e60cf7d98c5c6a640873d399f45d5.tar.gz
rails-fe0df25f7b4e60cf7d98c5c6a640873d399f45d5.tar.bz2
rails-fe0df25f7b4e60cf7d98c5c6a640873d399f45d5.zip
Move misplaced CHANGELOG entry
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7755 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--activerecord/CHANGELOG2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 6c747deb11..7accc76a38 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -90,6 +90,8 @@
* Fixed optimized route segment escaping. #9562 [wildchild, Jeremy Kemper]
+* Added block acceptance to JavaScriptHelper#javascript_tag. #7527 [Bob Silva, Tarmo Täna, rmm5t]
+
* root_path returns '/' not ''. #9563 [lifofifo]
* Fixed that setting request.format should also affect respond_to blocks [DHH]
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 9410de60c2..5e3280dda7 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -59,8 +59,6 @@
* RubyGem database adapters: expects a gem named activerecord-<database>-adapter with active_record/connection_adapters/<database>_adapter.rb in its load path. [Jeremy Kemper]
-* Added block-acceptance to JavaScriptHelper#javascript_tag #7527 [BobSilva/tarmo/rmm5t]
-
* Fixed that altering join tables in migrations would fail w/ sqlite3 #7453 [TimoMihaljov/brandon]
* Fix association writer with :dependent => :nullify. #7314 [Jonathan Viney]