Merge pull request #13015 from arunagw/task-creation-command-test

Added test when task generator called on revoke
Test for when controller with skip-assets
Merge pull request #13016 from arunagw/test-for-skip-assets-controller

Test for when controller with skip-assets
Raise RuntimeErrors with inspectable and MRI-independent messages.

Previous behaviour was MRI-dependent, now we're making sure the message
is correctly shown: something that can be relyied upon across every
Ruby implementation.
Properly fix Rubinius dependencies in Gemfile & Travis integration.

Before Rubinius 2.2.0, some parts of the stdlib were lazily loaded, even
if not included in the Gemfile. Now it's 100% required to include the
gem 'rubysl', otherwise the stdlib is not available entirely, breaking
everything.

Also, the rubysl-test-unit gem was depending on minitest ~> 4.7, thus causing
conflicts with Rails's dependency on minitest 5. That is not the case
anymore since rubysl-test-unit 2.0.2, so it is completely safe to
include it fully.

When Travis is going to update RVM to 1.24, it'll be safe to use rbx-2,
thus picking new versions automatically.
Merge pull request #13019 from razielgn/rbx-gemfile-and-travis-fixes

Rubinius Gemfile and travis fixes
Updated allow_failures for Rubinius 2.2.1.
Merge pull request #13021 from razielgn/rbx-gemfile-and-travis-fixes

Updated allow_failures for Rubinius 2.2.1.
a couple of copy-edits before merging [ci skip]
Merge remote-tracking branch 'docrails/master'

Conflicts:
	activesupport/lib/active_support/core_ext/hash/deep_merge.rb
	activesupport/lib/active_support/core_ext/hash/keys.rb
Merge pull request #13020 from razielgn/raise-inspectable-messages

Raise RuntimeErrors with inspectable and MRI-independent messages.
Globalize has moved to a new repository

From (svenfuchs/globalize3) to (globalize/globalize)
Added `rewhere` usage to AR querying guides
Merge pull request #13026 from vipulnsward/document_rewhere

Added `rewhere` usage to AR querying guides
Better error message for typos in assert_response argument.

This commit makes it really easy to debug errors due to typos like
"assert_response :succezz".
Merge pull request #13025 from pwnall/nice_test

Better error message for typos in assert_response argument.
`delgated` => `delegated`
Merge pull request #13029 from akshay-vishnoi/documentation

`delgated` => `delegated`
avoiding calling of #option_value_selected? two times
Merge pull request #13027 from akshay-vishnoi/f-refactor

avoiding calling of #option_value_selected? two times