Added :nodoc: for private methods
Merge pull request #10390 from Noemj/bind_param_handling

Added :nodoc: for relation.rb's private methods
Fix typos in deprecation proxy docs [ci skip]
Fix #8856 Ensure has_one association=(associate) triggers save.
activerecord/lib/active_record/associations.rb states:

    # [association=(associate)]
    #   Assigns the associate object, extracts the primary key, sets it as the foreign key,
    #   and saves the associate object.

Since commit 42dd5d9f2976677a4bf22347f2dde1a8135dfbb4 to fix #7191, this
is no longer the case if the associate has changed, but is the same
object. For example:

    # Pirate has_one :ship
    pirate = Pirate.create!(catchphrase: "A Pirate")
    ship = pirate.build_ship(name: 'old name')
    ship.save!

    ship.name = 'new name'
    pirate.ship = ship

That last line should trigger a save. Although we are not changing the
association, the associate (ship) has changed.
Mute psql output when running rake db:schema:load
Merge pull request #10349 from caliper-io/mute_psql_output

Fix noisy output when running rake db:schema:load on postgreSQL and structure.sql
Merge pull request #9857 from yyyc514/bad_params_should_400

failure to parse params should trigger a 400 Bad Request
maintain return value for recreate_database
Correct formatting for remaining booleans
routes.rb should teach how to use concerns
copy edits [ci skip]
Merge branch 'master' of github.com:lifo/docrails
Revert "Object#in? also accepts multiple parameters"

This reverts commit ebf69ab1636df74c76332c53bcd3d8494fb91b45.

`in?` must not take multiple parameters because its behavior would be
ambiguous:

    # Test if "B" is included in a list of names with `"B".in?(*names)`:
    names = ["BMorearty"]
    "B".in?(*names)   # => true

    names = ["BMorearty","rubyduo"]
    "B".in?(*names)   # => false

Conflicts:
	activesupport/lib/active_support/core_ext/object/inclusion.rb
	activesupport/test/core_ext/object/inclusion_test.rb
Revert "Correct formatting for remaining booleans"

It is not in the contract that flags have to be singletons,
the use of regular font indicates that.

This reverts commit 80036f9a5341bd831d125dc684841a8433d92070.
Revert "Consistent use of code syntax formatting for boolean values"

Same rationale as previous revert.

This reverts commit 887225e69b6cdd27f00cf043c4ac918ca5e18cbf.
Revert the guide after removing varargs from `in?`.
Fix failing AP test
Merge pull request #10394 from BMorearty/remove-varargs-from-in

Remove varargs from `Object#in?`
Rails 4 has deprecated :order in has_many to use a lambda instead, update the guide accordingly
Fix typo "can exploited" with "can be exploited"