mark ReversibleBlockHelper as :nodoc: [ci skip]
update ActiveRecord::AttributeMethods::Serialization documentation [ci skip]
Sort modules in alphabetical order.
Improve `belongs_to touch: true` timestamp test

Round off time to a whole second value to compensate for databases
that don't support fractional timestamps. Also add a assertion to
check that the old record is touched when the association is cleared.
correct image for unknown_action_create_for_posts.png
Merge pull request #133 from chandresh/master

Fixed the unknown_action_create_for_posts.png image
Merge pull request #10102 from xxxcaqui/master

Sort modules in active_record.rb
failing test for #9869
Fix scope chaining + STI

See #9869 and #9929.

The problem arises from the following example:

    class Project < ActiveRecord::Base
      scope :completed, -> { where completed: true }
    end

    class MajorProject < Project
    end

When calling:

    MajorProject.where(tasks_count: 10).completed

This expands to:

    MajorProject.where(tasks_count: 10).scoping {
      MajorProject.completed
    }

However the lambda for the `completed` scope is defined on Project. This
means that when it is called, `self` is Project rather than
MajorProject. So it expands to:

    MajorProject.where(tasks_count: 10).scoping {
      Project.where(completed: true)
    }

Since the scoping was applied on MajorProject, and not Project, this
fails to apply the tasks_count condition.

The solution is to make scoping apply across STI classes. I am slightly
concerned about the possible side-effects of this, but no tests fail and
it seems ok. I guess we'll see.
Merge pull request #10058 from jamesgolick/master

Avoid calling define_method in CollectionProxy#scope
Merge pull request #9996 from mikz/master

Association with inverse_of does not set the parent in association building block
Fix indent and remove extra white spaces
Move changelog to the top [ci skip]
Correctly parse bigint defaults in PostgreSQL
Refactoring some reused code into a method (inside of the routes
mapper) and adding a constant for all the possible scopes.
Change deprecated validates_presence_of

In Validations section the example contained "validates_presence_of" which is deprecated. It should be "validates :name, presence: true"
Remove deprecated attr_accessible mention
Merge pull request #10098 from subwindow/postgres_dump_bigint_default

Correctly parse bigint defaults in PostgreSQL

Conflicts:
	activerecord/CHANGELOG.md
Fix explicit names on multiple file fields

If a file field tag is passed the multiple option, it is turned into an
array field (appending "[]"), but if the file field is passed an
explicit name as an option, leave the name alone (do not append "[]").

Fixes #9830
Merge pull request #10106 from rmm5t/fix-explicit-name-on-multiple-fields-master

Fix explicit names on multiple file fields