Conflicts:
	activerecord/test/cases/associations/belongs_to_associations_test.rb

Don't indent blank lines in named base generators

Refactor Observer.observed_class

Revert "Added warning that require_tree includes files in unspecified order. So, that people may know the order of their scripts might be the reason that their scripts work in just fine in development but not in production. "

This reverts commit 9dbd5111.

Reason: Sounds like something for the guide, not the template.

removing changes made in ccd0b511 and 189a1728 [ci skip]

Remote ip logic and validation. IPv6 support.

Duplicate quote_table_name method

cleanliness in method parameters

Stamp out ruby-debug with debugger everywhere else in the code base

Minor refactor of serializable hash

Rename Observing#count_observers to Observing#observers_count

In the current router DSL, using the +match+ DSL
method will match all verbs for the path to the
specified endpoint.

In the vast majority of cases, people are
currently using +match+ when they actually mean
+get+. This introduces security implications.

This commit disallows calling +match+ without
an HTTP verb constraint by default. To explicitly
match all verbs, this commit also adds a
:via => :all option to +match+.

Closes #5964

(Fixed typo from previous commit: ccd0b511)