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

Merge url for tests and add changelog entry for #8233.

This resolves issues when rendering nested partials.
Previously the `PartialRenderer` was reused which led to
situations where the state of the renderer was reset.

Closes #8197

This is a list of mime types where template text is not html escaped
by default. It prevents `Jack & Joe` from rendering as
`Jack & Joe` for the whitelisted mime types. The default whitelist
contains text/plain.

This follows a whitelist approach where plain text templates are
not escaped, and all the others (json, xml) are. The mime type is
assumed to be set by the abstract controller.

[ci skip]

This reverts commit f4ad0ebe, reversing
changes made to 8b2cbb3a.

Conflicts:
	actionpack/CHANGELOG.md

REASON: This added introduced a bug when you have a shorthand route
inside a nested namespace.

See
https://github.com/rafaelfranca/rails/commit/281367eb770faf8077c1fd6194188e92ed1637a1

Now `BestStandardsSupport` middleware appends it's `X-UA-Compatible` value to app's value.
Also test for `BestStandardsSupport` middleware added.

This reverts commit a8560fa3.

If a unknown format is passed in a request, the methods html?, xml?, json? ...etc
Nil Exception.

This patch add a class NullMimeTypeObject, that is returned when  request.format is unknown
and it responds false to the methods that ends with '?'.

It refers to #7837, not fixes because it's not considered a improvement not a bug.

Also remove references for RAILS_ASSET_ID from the guides

[ci skip]

Removed the asset_path configuration from the guides and added an entry
in the upgrading_ruby_on_rails guide

[ci skip]

Accept either :remote or 'remote' in both the html_options and
(url_)options hash arguments to link_to.

the documentation on #assert_template states that the :locals option is
only available in view test cases:

    # In a view test case, you can also assert that specific locals are passed
    # to partials:

I added a warning when it's passed in an inapropriate context to prevent
a NoMethodError.

This was added in Rails 4 and we don't need changelog entries to
behavior changes

[ci skip]

It's best to just return text/plain when something has gone terribly
wrong.

Fixes #5660.

this is a patch for #7777.

Add a changelog entry for asset aliasing update in sprockets-rails. Supports referencing foo.js as foo/index.js and vice versa.

Given Im rendering an template `/layout/hello.html.erb`, assert_template was
passing with any string that matches. This behavior allowed false passing like:

	assert_template "layout"
	assert_template "out/hello"

Now the passing possibilities are:

	assert_template "layout/hello"
	assert_template "hello"

fixing assert_template bug when template matches expected, but not ends with

Cherry Pick Merge: Fixes issue #3849 assert_template false positive

taking redundant test off

prevening incorrect assert_template when rendering with repeated names in path

updating CHANGELOG with bugfix: assert_template false passing

This will set image's both width and height attributes to
value passed in size option.

CHANGELOG edits do not belongs on docrails, so I'll send a pull request
instead. Thanks @rafaelfranca for catching this.

This reverts commit 84c9491e.