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

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

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

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

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

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

    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.
    tricknotes committed Sep 6, 2016
  7. Merge pull request #26405 from alexcameron89/case_statement_formatting

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

    Minor grammar fix in engines.md [ci skip]
    vipulnsward committed on GitHub Sep 6, 2016
  9. Minor grammar fix in engines.md

    SpartaSixZero committed on GitHub Sep 6, 2016
  10. Fix Remaining Case-In-Assignment Statement Formatting

    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.
    alexcameron89 committed Sep 6, 2016
  11. Merge pull request #26394 from kamipo/remove_redundant_condition

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

    Remove not used alias method
    matthewd committed on GitHub Sep 6, 2016
  13. Remove not used alias method

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

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

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

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

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

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

    `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
    y-yagi committed Sep 5, 2016
  6. use `descendants` to get class that inherited `ActiveJob::Base`

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

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

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

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

    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`.
    y-yagi committed Sep 3, 2016
Commits on Sep 3, 2016
  1. Remove unnecessary `count` method for collection proxy

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

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

    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]
    naw committed Sep 3, 2016
  4. Merge pull request #26371 from duffyjp/master

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

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

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

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