fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer depends on/
Use ActiveRecord::Base#update! instead of #update_attributes!
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]
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]
use the cached arel table
Removing unused fake models from actionpack tests
Merge pull request #12553 from tchandy/master

Removing unused fake models from actionpack tests