Merge pull request #12534 from vipulnsward/minor_number_helper_perfs

Minor Refactoring to `NumberHelper#number_to_human`
Added --model-name option scaffold_controller_generator.
Merge pull request #11432 from yalab/generate_model_name_option

Add --model-name option into scaffold_controller generator
Prepare generated Gemfile for Capistrano 3

Capistrano 3 is now rails-less, so we need to encourage developers to use capistrano-rails gem.

More details: http://www.capistranorb.com/documentation/frameworks/ruby-on-rails/

[ci skip]
update digestor code based on review
Add missed require making `enable_warnings` available
Merge pull request #12543 from route/missed_require

Add missed require making `enable_warnings` available
Merge pull request #12524 from kirs/patch-1

Prepare generated Gemfile for Capistrano 3
Pluck on NullRelation accepts a list of columns

`pluck` was updated to accept a list of columns, but the `NullRelation`
was never updated to match that signature. As a result, calling `pluck`
on a `NullRelation` results in an `ArgumentError`.
Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer depends on/"

This reverts commit 49f513c25415f94452af1bb8fe3f55f090a6d0f2.

Reason: Changelogs aren't supposed to be edited in docrails.
Merge branch 'master' of github.com:rails/docrails
grammar fix (reverted in e9a1ecd)
Merge pull request #12547 from derekprior/dp-fix-null-relation-pluck

Pluck on NullRelation should accept a list of columns
Don't remove the select values to add they back again

Conflicts:
	activerecord/lib/active_record/relation/finder_methods.rb
Fix typo in the changelog entry

[ci skip]
Merge branch 'master' into joindep

* master: (44 commits)
  grammar fix (reverted in e9a1ecd)
  Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer depends on/"
  Add missed require making `enable_warnings` available
  Prepare generated Gemfile for Capistrano 3
  Added --model-name option scaffold_controller_generator.
  read the association instead of sending
  we should have unique sponsorable ids in the fixtures at least
  simplify populating the ordering hash
  the preloader for the RHS has all the preloaded records, so ask it
  only calculate offset index once. #12537
  Remove size alias for length validation
  Fix `singleton_class?`
  Minor Refactoring to `NumberHelper#number_to_human`
  `$SAFE = 4;` has been removed with Ruby 2.1
  scope_chain should not be mutated for other reflections
  Remove `default_primary_key_type`  and extract contains of `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters.
  cleanup changelog entry format. [ci skip]
  Extract a function to determine if the default value is a function
  Push default_function to superclass to avoid method check
  Dump the default function when the primary key is uuid
  ...

Conflicts:
	activerecord/lib/active_record/relation/finder_methods.rb
use the cached arel table
Merge branch 'master' into joindep

* master:
  use the cached arel table
  Fix typo in the changelog entry
  Don't remove the select values to add they back again
  Pluck on NullRelation accepts a list of columns

Conflicts:
	activerecord/lib/active_record/relation/finder_methods.rb
pass the chain the join_constraints
stop reversing tables until we absolutely must