Please sign in to comment.
Merge branch '3-1-stable' into 3-1-0
* 3-1-stable: (21 commits) Added a test to check for correct behaviour with no options in add_index command recorder Using .try to test for the existence of a method option in a nil-resistent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat Neatened up the invert_add_index method as per suggeston Simple fix for correctly inverting an add_index migration when a name has been provided Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251 Fix Sprockets rewrite_asset_path Merge pull request #2620 from cesario/3-1-0 Fix sprockets warnings Use typewriter styling on url_for in documentation Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14 remove extra space since comment_if already returns the space. (cherry picked from commit 5e73a2f) Merge pull request #2596 from dharmatech/patch-1 Merge pull request #2595 from smartinez87/assets-guide Merge pull request #2597 from dharmatech/patch-2 Merge pull request #2604 from vijaydev/params_wrapper_docs Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumption Merge pull request #2603 from vijaydev/guides Merge pull request #2581 from guilleiguaran/debug-assets-in-dev Revert "Deprecate the use of non-public methods by Module#delegate" mailer guide: fixes indentation, and use fixed width fonts wherever necessary ...
- Loading branch information...
Showing with 61 additions and 11 deletions.
- +6 −3 actionpack/lib/sprockets/assets.rake
- +12 −1 actionpack/lib/sprockets/helpers/rails_helper.rb
- +2 −3 actionpack/lib/sprockets/railtie.rb
- +4 −2 activerecord/lib/active_record/migration/command_recorder.rb
- +1 −1 activerecord/lib/active_record/relation/predicate_builder.rb
- +12 −0 activerecord/test/cases/migration/command_recorder_test.rb
- +23 −0 activerecord/test/cases/relations_test.rb
- +1 −1 railties/lib/rails/generators/rails/app/templates/config/application.rb