Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: master
Commits on Aug 22, 2014
  1. Fix setting a polymorphic association's attributes to nil and saving,…

    authored
    … 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. @senny

    Merge pull request #16633 from tgxworld/prefer_log_message_through_block

    senny authored
    Pass logging message through block.
  3. @zzak

    Merge pull request #16634 from tgxworld/missing_space

    zzak authored
    Missing space. [CI SKIP]
  4. @tgxworld

    Missing space. [CI SKIP]

    tgxworld authored
  5. @tgxworld
  6. @zzak

    Merge pull request #11859 from zzak/nested_model_forms_guide

    zzak authored
    See AR::Associations for greater detail in Nested Model Forms Guide [ci skip]
  7. @zzak

    add nested_model_forms to guides/documents.yaml [wip] [ci skip]

    zzak authored zzak committed
  8. @zzak

    Merge branch 'jonatack-patch-8'

    zzak authored
  9. @jonatack @zzak

    Follow up on #16408

    jonatack authored zzak committed
    [skip ci]
  10. @zzak
  11. @zzak

    Merge pull request #16630 from tomkadwill/added_has_and_belongs_to_ma…

    zzak authored
    …ny_scope_documentation
    
    [ci skip] Added documentation for has_and_belongs_to_many scope parameter
  12. @tomkadwill
  13. @jeremy

    Merge pull request #16629 from rails/revert-16438-input-placeholder-i18n

    jeremy authored
    Revert "Add I18n support for `:placeholder` HTML option is passed to for...
  14. @jeremy
  15. @jeremy

    Merge pull request #16604 from saarons/clean-remote-ip-middleware

    jeremy authored
    ActionDispatch::RemoteIp accept IPAddr matches for trusted proxies
  16. @vijaydev

    fix grammar [ci skip]

    vijaydev authored
  17. @vijaydev
  18. @saarons

    Refactor ActionDispatch::RemoteIp

    saarons authored
    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. @fxn
  2. @fxn
  3. @rafaelfranca

    Merge pull request #16621 from Calyhre/patch-1

    rafaelfranca authored
    Update documentation, Add change to ActionView Notable changes
  4. @Calyhre

    Add change to ActionView Notable changes [ci skip]

    Calyhre authored Calyhre committed
  5. @vijaydev

    Merge pull request #16271 from alol/action-view-overview-guide-tweaks

    vijaydev authored
    Small Action View Overview guide grammar and readability tweaks
  6. @vijaydev

    Merge pull request #16204 from jonatack/patch-7

    vijaydev authored
    Fix minor typos and improve grammar and code formatting
  7. @zzak

    Merge pull request #16617 from tomkadwill/added_has_one_scope_documen…

    zzak authored
    …tation
    
    [ci skip] Added documentation for has_one scope parameter
  8. @zzak

    Merge pull request #16615 from tgxworld/guide_fix

    zzak authored
    [ci skip] Grammar fixes for upgrade guide from 4.0 to 4.1
  9. @tomkadwill
  10. @tgxworld

    Guide fix. [CI SKIP]

    tgxworld authored
    Related: rails#16607
  11. @vijaydev
  12. @zzak

    Merge pull request #16612 from loganhasson/master

    zzak authored
    [ci skip] Clarify Action Mailer/Active Job usage note
  13. @loganhasson
  14. @spastorino

    Merge pull request #16607 from tgxworld/upgrading_guide_pass

    spastorino authored
    Upgrade guide pass. [CI SKIP]
  15. @senny

    Merge pull request #16608 from GRoguelon/fix_issues_in_4_2_release_notes

    senny authored
    Fix some issues in 4.2 release notes. [ci skip]
  16. Fix some issues in 4.2 release notes.

    Geoffrey ROGUELON authored
    Remove duplicate line in Railties.
    
    [ci skip]
  17. @pixeltrix

    Merge pull request #15443 from tgxworld/preload_head_routes

    pixeltrix authored
    Map HEAD requests to GET routes instead of duplicating GET routes.
Something went wrong with that request. Please try again.