Fixed a bug where the inflector would replace camelCase strings and disregarding specified acronyms, fixes #8015
Added Inflector#underscore fix to the changelog
Merge pull request #8156 from fredwu/acronym_fix-master

Fix for inflector's incorrect camelCase replacement for acronyms
revises the CHANGELOG entry from 26aa265 [ci skip]
Update image in Getting Started Guide [ci skip]

When I updated these images, I must have gotten this one wrong. Now it's
right.

Fixes #9749.
Revert "Merge pull request #8156 from fredwu/acronym_fix-master"

This reverts commit 867dc1700f32aae6f98c4651bd501597e6b52bc0, reversing
changes made to 9a421aaa8285cf2a7ecb1af370748b0337818930.

This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065

Please see comments on #8156 for some discussion.
Getting Started Guide: typo fix. [ci skip]

There was an s missing in 'views'.

Fixes #9752.
Refactor Person/Friendship relationships to be more intuitive

PR #5210 added a Friendship model to illustrate a bug, but in doing so
created a confusing structure because both belongs_to declarations in
Friendship referred to the same side of the join. The new structure
maintains the integrity of the bug test while changing the follower
relationship to be more useful for other testing.
Merge pull request #9747 from macksmind/refactor_friend_follower

Refactor Person/Friendship relationships to be more intuitive
remove unused parameter passed to assert_query_equal method
Allow pass multipart option to form_for
extra lines from Rakefile removed, which also threw warning
refactor test to drop unnecessary hash creation, test directly instead
Merge pull request #9759 from vipulnsward/remove_hash_from_tests

refactor test to drop unnecessary hash creation, test directly instead
Merge pull request #9758 from vipulnsward/remove_from_rakefile

Remove extra lines from Rakefile, which threw warning
Merge pull request #9745 from madmax/allow_pass_multipart_to_form_for

Fix regression: allow pass multipart option to form_for
Merge pull request #9757 from vipulnsward/remove_message_param

remove unused parameter passed to assert_query_equal method
Fix rake test warnings in actionpack
Merge pull request #9754 from macksmind/fix_actionpack_warnings

Fix rake test warnings in actionpack
sets limit 191 for schema_migrations#version in mysql2 if the encoding is "utf8mb4"

Please, see rationale in the included CHANGELOG patch.