The option actually needs to be set on action_dispatch. [ci skip]
Change to require all active_support/deprecation since that's the actual entry point for the deprecation methods.
Adds explanation of :base attribute to errors.add [ci skip]
Deprecate superclass_delegating_accessor, use class_attribute instead.
assert_raise + assert_equal on the returned exception message work just fine, there is no need for extra work, specially like this overly complicated helper.
Just pass in the expected database as argument rather than "caching" it in a hash and using the hash in the helper methods.
Also fix indent of test block.
ActiveRecord#touch should accept multiple attributes Conflicts: activerecord/CHANGELOG.md
Refactor to a reusable method.
No need to check that each line contains an extra space, just matching the space in the regexp is enough to ensure that.
Removed command "application"
There's no need to rely on Active Support's Hash#reverse_merge for simple cases with default values, since we can just merge from the default rather than reverse merge from the options. This also avoids the creation of one extra hash object by moving to a Hash#merge! call.
Add spaces to the log message of ActionController:: LogSubscriber#deep_munge
Bump version of bcrypt gem
From #14026: Specific rbx-2 to limit testing on Rubinius 2.x (since there will be other versions of Rubinius > 2.x soon). Also, as of Rubinius 2.2.5, it is no longer necessary to bundle the rubysl gem. This is what Rails master/4.1 supports, so we don't need to add rubysl to gemfiles anymore.
…test_name Fix test name typo in app generator tests.
We noticed the rails gem increased in size between the beta and rc versions, and the reason is that some guides images were updated but not properly optimized, and one image changed from png to jpg, way bigger. Converting the jpg image back to png, and using ImageOptim to optimize all the images for web view, improves the situation [ci skip]. --- In current master/4-1-stable: 508K guides/assets/images/getting_started/ In v4.1.0.beta1: 268K guides/assets/images/getting_started/ In 4-0-stable 328K guides/assets/images/getting_started/ After the patch: 260K guides/assets/images/getting_started/
Remove 4-1 related entries from master [ci skip]