diff options
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rw-r--r-- | activerecord/CHANGELOG | 2 |
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] |