Permalink
Commits on Sep 6, 2016
  1. Merge pull request #26390 from Neodelf/format_mds

    vipulnsward committed Sep 6, 2016
    [ci skip] Simply formatting documents
  2. Merge pull request #26412 from rails/revert-26410-rm-dups

    guilleiguaran committed Sep 6, 2016
    Revert " [ci skip] Remove duplicate example."
  3. Merge pull request #26410 from aditya-kapoor/rm-dups

    vipulnsward committed Sep 6, 2016
     [ci skip] Remove duplicate example.
  4. Merge pull request #24612 from vipulnsward/fix-li-ol-width

    vijaydev committed Sep 6, 2016
    Selectively add `li ul, li ol { margin:0 1.5em; }` to subColl as needed
  5. Merge pull request #26408 from tricknotes/bye-mongrel-from-docs

    vipulnsward committed Sep 6, 2016
    Remove the word "mongrel" from documents [ci skip]
  6. Remove the word "mongrel" from documents

    tricknotes committed Sep 6, 2016
    Currently mongrel is not maintained.
    And it couldn't be built with any Ruby versions that
    supported by Rails.
    
    It is reasonable to remove the word "mongrel" in order to avoid
    confusion from newcomer.
  7. Merge pull request #26405 from alexcameron89/case_statement_formatting

    fxn committed Sep 6, 2016
    Fix Remaining Case-In-Assignment Statement Formatting
  8. Merge pull request #26406 from SpartaSixZero/master

    vipulnsward committed Sep 6, 2016
    Minor grammar fix in engines.md [ci skip]
  9. Fix Remaining Case-In-Assignment Statement Formatting

    alexcameron89 committed Sep 6, 2016
    Recently, the Rails team made an effort to keep the source code consistent, using Ruboco
    (bb1ecdc and below). Some of the case
    statements were missed.
    
    This changes the case statements' formatting and is consistent with changes
    in 810dff7 and db63406.
  10. Merge pull request #26394 from kamipo/remove_redundant_condition

    pixeltrix committed Sep 6, 2016
    Remove redundant `!loaded?` condition
  11. Merge pull request #26397 from yui-knk/unused_inner_alias

    matthewd committed Sep 6, 2016
    Remove not used alias method
  12. Remove not used alias method

    yui-knk committed Sep 6, 2016
    Bang methods of `AR::QueryMethods` are used only internally.
    We only use `left_outer_joins!`, so we can remove this alias.
  13. Remove redundant `!loaded?` condition

    kamipo committed Sep 6, 2016
    Already checked `if !find_target? || loaded?`, unnecessary `!loaded?` in
    elsif condition.
Commits on Sep 5, 2016
  1. Merge pull request #26370 from yahonda/rails26368

    pixeltrix committed Sep 5, 2016
    Move `require "models/post"` before `require "models/comment"`
  2. Merge pull request #26391 from y-yagi/use_descendants_to_get_all_subc…

    pixeltrix committed Sep 5, 2016
    …lasses
    
    use `descendants` to get class that inherited `ActiveJob::Base`
  3. Merge pull request #26379 from kamipo/remove_unnecessary_query_scope

    pixeltrix committed Sep 5, 2016
    Remove unnecessary `query_scope`
  4. Merge pull request #26392 from y-yagi/chage_descendants_to_public_api

    vipulnsward committed Sep 5, 2016
    change `Class#descendants` to public API [ci skip]
  5. change `Class#descendants` to public API [ci skip]

    y-yagi committed Sep 5, 2016
    `Class#descendants` has already been displayed in Rails guide,
    so I think that may be displayed in doc.
    http://guides.rubyonrails.org/active_support_core_extensions.html#descendants
  6. use `descendants` to get class that inherited `ActiveJob::Base`

    y-yagi committed Sep 5, 2016
    `subclasses` get only child classes.
    Therefore, if create a job common parent class as `ApplicationJob`,
    inherited class does not get properly.
Commits on Sep 4, 2016
  1. Merge pull request #26377 from y-yagi/rename_test_method_to_avoid_ove…

    eileencodes committed Sep 4, 2016
    …rriding
    
    rename test method to avoid overriding
  2. Merge pull request #26383 from kamipo/remove_unnecessary_count_for_co…

    eileencodes committed Sep 4, 2016
    …llection_proxy
    
    Remove unnecessary `count` method for collection proxy
  3. Merge pull request #26384 from y-yagi/make_fixture_file_upload_in_int…

    eileencodes committed Sep 4, 2016
    …egration_test
    
    make `fixture_file_upload` work in integration tests
  4. make `fixture_file_upload` work in integration tests

    y-yagi committed Sep 3, 2016
    Currently, `fixture_file_upload` does not work in integration test.
    Because, `TestProcess` module has been include in `Session` class, but
    `fixture_path` can not get from `Session` class.
    
    Modify to include `TestProcess` in `IntegrationTest` class in order to get
    correct value of `fixture_path`.
Commits on Sep 3, 2016
  1. Remove unnecessary `count` method for collection proxy

    kamipo committed Sep 3, 2016
    Simply use its own method because `CollectionProxy` inherits `Relation`.
  2. Merge pull request #26382 from naw/transaction-callback-docs

    vipulnsward committed Sep 3, 2016
    Update ActiveRecord callback guide for exceptions [ci skip]
  3. Update docs for change in transaction callback exceptions

    naw committed Sep 3, 2016
    07d3d40 changed how exceptions are handled in after_commit
    and after_destroy callbacks.  This commit updates the 5.0
    release notes and the  ActiveRecord callback guide to reflect
    the new behavior.
    
    [ci skip]
  4. Merge pull request #26371 from duffyjp/master

    guilleiguaran committed Sep 3, 2016
    Allow download of email attachments in the Mailer Preview template.
  5. Merge pull request #26375 from kamipo/remove_blank_else_branch

    guilleiguaran committed Sep 3, 2016
    Remove blank else branch
  6. Merge pull request #26381 from kamipo/extract_duplicated_create_for_a…

    senny committed Sep 3, 2016
    …ssociation
    
    Extract duplicated `create` and `create!` definition for association
  7. Merge pull request #26374 from kamipo/fix_broken_heredoc_indentation

    fxn committed Sep 3, 2016
    Fix broken heredoc indentation caused by rubocop auto-correct