This reverts commit 18616114, reversing
changes made to cad9eb17.

Inline syntax for variants

In most cases, when setting variant specific code, you're not sharing any code
within format.

Inline syntax can vastly simplify defining variants in those sitiations:

  respond_to do |format|
    format.js { render "trash" }
    format.html do |variant|
      variant.phone { redirect_to progress_path }
      variant.none  { render "trash" }
    end
  end
`
Becomes:

  respond_to do |format|
    format.js         { render "trash" }
    format.html.phone { redirect_to progress_path }
    format.html.none  { render "trash" }
  end

@responses hash needs to be initialized with mime types that we get from
Collector#collect_mimes_from_class_level. Mime::Type class as key and nil as
value. This need to happen before content negotiation. Before that, it was
looping though mime types and executing mime-type-generated method inside
collector (see
AbstractController::Collector#generate_method_for_mime). That approach resulted
in 2 unnecessary method calls for each mime type
collected by Collector#collect_mimes_from_class_level.

Now hash is initialized in place, without usage of Collector#custom method.

Upgrade minitest version

We made a change in #13213 that depends on a new file that's only in
minitest 5.1.0+, so the version should be updated.

Require action_view explicitly in AC::Base

fix tiny typo in comment, "state_state" should be "stale_state" [ci skip]

Very tiny typo fix [ci skip]

Cycle object should accept an array

Conflicts:
	actionview/CHANGELOG.md

with a set of comma-separated objects.

Minitest upgrade broke build

Some improvements on building nested forms. [ci skip]

load_missing_constant is a private method that basically plays the role of const_missing.
This method has an error condition that is surprising: it raises if the class or module
already has the missing constant. How is it possible that if the class of module has
the constant Ruby has called const_missing in the first place?

The answer is that the from_mod argument is self except for anonymous modules, because
const_missing passes down Object in such case (see the comment in the source code of the
patch for the rationale).

But then, it is better to pass down Object *if Object is also missing the constant* and
otherwise err with an informative message right away.

Use `Base.strict_decode64` instead of `Base.decode64` 

https://github.com/seattlerb/minitest/commit/34760e3b268bc1bb4ac5fe1a44ef1ff0a2f9bd4d

This PR should fix build

Skipping debugger from plugin Gemfile for JRuby

Enum doc fixes

Fixed test for Mime::VCF

Added here 13dd38ce

capitalize words starting after numbered list to maintain consistency [c...

Make clear that the enum array should not be changed once defined. [ci skip]

Fix issue with Kernel#silence_stream leaking file descriptors

Calling Kernel#silence_stream creates a new file descriptor which isn't
closed after it is used. As a result calling silence_stream multiple
times leads to a build up of loose file descriptors and can cause issues
in environments where garbage collection isn't run often.

Fix the merge of a label class defined inside the block