Permalink
Switch branches/tags
Commits on Aug 22, 2014
  1. Fix setting a polymorphic association's attributes to nil and saving,…

    willbryant committed Aug 22, 2014
    … if that association had been non-nil and loaded.
    
    This raised a nil deref, because the stale_state test returned true (the target was no longer valid) and so #find_target called #scope, which ran klass.all - which failed because #klass is now nil.
    
    This only happened if saving the record holding this polymorphic association, as opposed to say referencing the association, because the latter is implemented by the SingularAssociation#reader method which called #reload if the target was stale.  This patch does something similar, but a bit less radical (calling reset).
  2. Merge pull request #16633 from tgxworld/prefer_log_message_through_block

    senny committed Aug 22, 2014
    Pass logging message through block.
  3. Merge pull request #16634 from tgxworld/missing_space

    zzak committed Aug 22, 2014
    Missing space. [CI SKIP]
  4. Missing space. [CI SKIP]

    tgxworld committed Aug 22, 2014
  5. Merge pull request #11859 from zzak/nested_model_forms_guide

    zzak committed Aug 22, 2014
    See AR::Associations for greater detail in Nested Model Forms Guide [ci skip]
  6. Merge branch 'jonatack-patch-8'

    zzak committed Aug 22, 2014
  7. Follow up on #16408

    jonatack authored and zzak committed Aug 15, 2014
    [skip ci]
  8. Merge pull request #16630 from tomkadwill/added_has_and_belongs_to_ma…

    zzak committed Aug 22, 2014
    …ny_scope_documentation
    
    [ci skip] Added documentation for has_and_belongs_to_many scope parameter
  9. Merge pull request #16629 from rails/revert-16438-input-placeholder-i18n

    jeremy committed Aug 22, 2014
    Revert "Add I18n support for `:placeholder` HTML option is passed to for...
  10. Merge pull request #16604 from saarons/clean-remote-ip-middleware

    jeremy committed Aug 22, 2014
    ActionDispatch::RemoteIp accept IPAddr matches for trusted proxies
  11. fix grammar [ci skip]

    vijaydev committed Aug 22, 2014
  12. Refactor ActionDispatch::RemoteIp

    saarons committed Aug 20, 2014
    Refactored IP address checking in ActionDispatch::RemoteIp to rely on
    the IPAddr class instead of the unwieldly regular expression to match
    IP addresses. This commit keeps the same api but allows users to pass
    IPAddr objects to config.action_dispatch.trusted_proxies in addition
    to passing strings and regular expressions.
    
    Example:
    
        # config/environments/production.rb
        config.action_dispatch.trusted_proxies = IPAddr.new('4.8.15.0/16')
Commits on Aug 21, 2014
  1. Merge pull request #16621 from Calyhre/patch-1

    rafaelfranca committed Aug 21, 2014
    Update documentation, Add change to ActionView Notable changes
  2. Merge pull request #16271 from alol/action-view-overview-guide-tweaks

    vijaydev committed Aug 21, 2014
    Small Action View Overview guide grammar and readability tweaks
  3. Merge pull request #16204 from jonatack/patch-7

    vijaydev committed Aug 21, 2014
    Fix minor typos and improve grammar and code formatting
  4. Merge pull request #16617 from tomkadwill/added_has_one_scope_documen…

    zzak committed Aug 21, 2014
    …tation
    
    [ci skip] Added documentation for has_one scope parameter
  5. Merge pull request #16615 from tgxworld/guide_fix

    zzak committed Aug 21, 2014
    [ci skip] Grammar fixes for upgrade guide from 4.0 to 4.1
  6. Guide fix. [CI SKIP]

    tgxworld committed Aug 21, 2014
    Related: rails#16607
  7. Merge pull request #16612 from loganhasson/master

    zzak committed Aug 21, 2014
    [ci skip] Clarify Action Mailer/Active Job usage note
  8. Merge pull request #16607 from tgxworld/upgrading_guide_pass

    spastorino committed Aug 21, 2014
    Upgrade guide pass. [CI SKIP]
  9. Merge pull request #16608 from GRoguelon/fix_issues_in_4_2_release_notes

    senny committed Aug 21, 2014
    Fix some issues in 4.2 release notes. [ci skip]
  10. Fix some issues in 4.2 release notes.

    Geoffrey ROGUELON
    Geoffrey ROGUELON committed Aug 21, 2014
    Remove duplicate line in Railties.
    
    [ci skip]
  11. Merge pull request #15443 from tgxworld/preload_head_routes

    pixeltrix committed Aug 21, 2014
    Map HEAD requests to GET routes instead of duplicating GET routes.