Added test to ensure that DescendantsTracker does not leak memory on singleton classes
Add rake test description

No behavior change
Allow use of assert_template with the :file option.
This worked in Rails 3.2, but was a regression in 4.0.0.beta1
ActiveSupport::Notifications::Instrumenter#instrument should yield
its payload the same way that ActiveSupport::Notifications does.
Fix spelling in test name.
Use ActionView::OutputBuffer#safe_append= from templates
avoid extra method calls for appending newlines

before:

        ');@output_buffer.append= ( content_icon row[:content] );@output_buffer.safe_concat('
');@output_buffer.safe_concat('        ');@output_buffer.append= ( spinner_img );@output_buffer.safe_concat('
');@output_buffer.safe_concat('      </td>
      <td class="content">
        ');@output_buffer.append= ( content_link row[:content] );@output_buffer.safe_concat('
');@output_buffer.safe_concat('      </td>
      <td class="message">
');

after:

        ';@output_buffer.append=( content_icon row[:content] );@output_buffer.safe_append='
        ';@output_buffer.append=( spinner_img );@output_buffer.safe_append='
      </td>
      <td class="content">
        ';@output_buffer.append=( content_link row[:content] );@output_buffer.safe_append='
      </td>
      <td class="message">
';
Typppo
Fix ActiveRecord `subclass_from_attrs` when eager_load is false.
It cannot find subclass because all classes are loaded automatically
when it needs.
Update capture_helper.rb

if there's content for the right column, then we need the two-column class, if not the one-column
Use the instrumentation framework to instrument Strong Params
fixes active_record_querying #pluck example
Merge pull request #9464 from jcoyne/assert_template_file

Allow use of assert_template with the :file option.
Move AP changelog entry to the top [ci skip]
Fix hash spaces and use 1.9 style hash [ci skip]
Combine scope conditions using AND

Currently Post.active.inactive will result in Post.inactive since
the last where clause wins when scopes are merged.

This pull request will merge all scopes ( barring defaul scope)
using AND.

The default scope will be overridden if another scope acts on the
same where clause.

closes #7365
SQLite3 3.6.8+ supports savepoints

http://www.sqlite.org/lang_savepoint.html
https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132
Merge pull request #9605 from neerajdotname/sqlite-support-savepoint

SQLite3 3.6.8+ supports savepoints
Fix warnings
If an index can't be found by column, use the index name.

schema_statements uses the column name by default to construct the index name, and then raises an exception if it doesn't exist, even if the name option is specified, which causes #8858.  this commit makes index_name_for_remove fall back to constructing the index name to remove based on the name option.
remove the new metadata note in Rails 4 upgrade guide

this was pulled out of Rails 4, see rails/rails#8399 for the discussion