Fix broken link in Active Record Query Interface guide
refactor the naming within plugin new generator

Having a method called `full?`, which checks on :full and :mountable
is very confusing. I renamed `full?` to `engine?` and created a `full?`
method that only checks the `:full` option
bug in example '<%= form_for ...' should be '<% form_for ...'
remove previous commit
embed code example using backticks in caching guide
fixed a minor spelling error
Allow setting a symbol as path in scope on routes

Was surprising found that this example doesn't work:

  scope :api do
    resources :users
  end

and the right form to use it is:

  scope 'api' do
    resources :users
  end

I think this should work similary as `namespace` where both are allowed.
These two are equivalent:

  namespace :api do
    resources :users
  end

  namespace 'api' do
    resources :user
  end
prevent mass assignment of polymorphic type when using `build`

Closes #8265
Merge pull request #8114 from guilleiguaran/use-symbols-in-scope

Allow setting a symbol as path in scope on routes
Indent changelog markdown code to highlight correctly

[ci skip]
Merge pull request #8291 from senny/8265_build_with_polymorphic_association

prevent mass assignment of polymorphic type when using `build`

Conflicts:
	activerecord/CHANGELOG.md
Merge branch 'master' of github.com:lifo/docrails
`assert_template` fails with empty string when a template has been rendered

For instance, it prevents false positive in this case:

    file = nil
    get :index
    assert_template("#{file}")
`assert_template` fails with empty string.
Move initialize_copy method around to let new method / build alias closer
Simplify constraints condition in scope when checking for Hash
Normalize scope recovering :blocks option name

Use the same :blocks key in the recover hash to revert the scope options
later.
Simplify scope options recovery by using merge!

Instead of iterating again over the options and setting one by one, we
can just merge the recover hash back to the scope one since all keys
match.
Use merge! in some places to avoid creating extra hashes
Refector a bit to remove extra slice iteration and splat call

This yields a small bit of performance improvement when building the
defaults from constraints, specially considering that it's rather common
for constraints to be empty.

Also, there's a bit of duplicated code in here that I have to check
before extracting.