Renamed generated_feature_methods to generated_association_methods.
Use 1.9 Hash syntax consistently
Merge pull request #12773 from ptn/use_19_syntax_in_schema_test

Use 1.9 Hash syntax consistently
Remove private API test
Merge pull request #12390 from kennyj/rename_to_association_methods

Renamed generated_feature_methods to generated_association_methods.

Conflicts:
	activerecord/lib/active_record/associations/builder/association.rb
	activerecord/lib/active_record/associations/builder/singular_association.rb
	activerecord/test/cases/base_test.rb
define enum methods inside a `Module` to make them overwritable.
Clarify HTML Safe Translations [ci-skip]

I think it's confusing to say "Use them in views without escaping." We
use all keys in views without escaping - the escaping is done for us
automatically _unless_ we call html_safe or the key ends in _html.
Merge pull request #12776 from derekprior/dp-i18n-doc-fix

Clarify HTML Safe Translations
direct enum assignment rasies ArgumentError for unknown values.
store enum mapping using `Strings` instead of `Symbols`.

This allows to assign both `String` and `Symbol` values to the enum
without having to call `to_sym`, which is a security problem.
check existence of value in validation of uniqueness if it is a relation