just a consolidation of the changelogs with minimal formatting [ci skip]
This reverts commits 911a085 and 30b31f5. Reason: these changes make the Active Model tests fail randomly. Some examples: http://travis-ci.org/#!/rails/rails/jobs/1498992 http://travis-ci.org/#!/rails/rails/jobs/1496948 http://travis-ci.org/#!/rails/rails/jobs/1489985 This script was used to reproduce these breaks: https://gist.github.com/f6828a03ee4d40bffbc3 200 times, 0 failures
Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase
Correct the use of to_model in polymorphic routing
In integration tests, you might want to use helpers from engines that you mounted in your application. It's not hard to add it by yourself, but it's unneeded boilerplate. mounted_helpers are now included by default. That means that given engine mounted like: mount Foo::Engine => "/foo", :as => "foo" you will be able to use paths from this engine in tests this way: foo.root_path #=> "/foo" (closes #6573)
remove unneeded blank line from !namespeced? generated controllers
Revert "Only include Rake::DSL if it's defined."
improve readability of AR explain result
From the Pull Request #6461
This reverts commit 82c3aca. Reason: Ruby 1.9.3 is shipped with Rake > 0.9
now we can invoke previously added scope extension methods
* master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
…to-separate-method Extracted redirect logic from ActionController::Force::ClassMethods.forc...
…orce_ssl Prior to this patch the existing .force_ssl method handles both defining the filter and handling the logic for performing the redirect. With this patch the logic for redirecting to the HTTPS protocol is separated from the filter logic that determines if a redirect should occur. By separating the two levels of behavior, an instance method for ActionController (i.e. #force_ssl_redirect) is exposed and available for more granular SSL enforcement. Cleaned up indentation.
Eliminate the warnings generated by redefining methods and constants.