Enable jruby and rubinius on travis
Using URI.parser.unescape to avoid warnings
Merge pull request #11724 from arunagw/warning-removed-ap

Using URI.parser.unescape to avoid warnings
Merge pull request #11741 from Karunakar/failing_test_in_local

fix for postgresql failing test in local
Merge pull request #11712 from atambo/activesupport_testing_isolation_jruby

Fix ActiveSupport::Testing::Isolation on jruby
Merge pull request #11738 from gaurish/guides-association-basics-fix

[Fixes #11734]Correct Association Basics Guide on has_and_belongs_to_many

[ci skip]
Merge pull request #11733 from iainbeeston/master

i18n guide update: corrected reference to activerecord to instead reference activemodel
Conflicts:
	guides/source/i18n.md

[ci skip]
Revert "Merge pull request #11712 from atambo/activesupport_testing_isolation_jruby"

This reverts commit ff2091071bfa600ac93ad2b5a591355ce43abbf1.

Needs more work on 4-0-stable to make these tests work with JRuby
Merge pull request #11747 from bradly/guides_getting_started_fix

Add note that you must be in the rails app when starting the server
No need to abbreviate application

[ci skip]
Merge pull request #11737 from tkhr/fix-document-about-on-validation-helpers

Fix active_record_validations.md document, `:save` for `on:` validation helper was never available
Conflicts:
	guides/source/active_record_validations.md

[ci skip]
Remove "Using Action View outside of Rails" section from AV overview guide

The section was clearly wrong and was just an example about how to use ActiveSupport helpers in Rack/Sinatra

[ci skip]
Merge pull request #11677 from jaggederest/master

update guide to reflect default HMAC SHA1 in MessageVerifier used in SignedCookieStore

[ci skip]
Merge pull request #11665 from mshytikov/fix-config-log_level

Rails.logger should have level specified by config.log_level.
Conflicts:
	activemodel/test/cases/railtie_test.rb
Merge pull request #11751 from rmm5t/assert_dom_equal-message

Pass assert_dom_equal message arg to underlying assertion
Conflicts:
	actionpack/CHANGELOG.md
Merge pull request #11757 from ryog/fix_document_active_model_errors

Fix: documentation for ActiveModel::Errors [ci skip]
Merge pull request #11760 from rahul100885/master

Added data for permit array into scalar value

[ci skip]
getting started guide: pass the resource to the URL helper [ci skip]

Passing the actual ID is not idiomatic.
migrations guide: fix and edits [ci skip]
Merge pull request #11762 from peterkovacs/patch-2

Free result_metadata directly instead of freeing 2nd, redundant call.