Permalink
Commits on Nov 15, 2013
  1. Merge pull request #12531 from iamvery/database-tasks-exit-status

    rafaelfranca committed Nov 15, 2013
    Explicitly exit with status "1" for create and drop task failures
    
    Conflicts:
    	activerecord/CHANGELOG.md
  2. Merge pull request #12853 from joshjordan/master

    rafaelfranca committed Nov 15, 2013
    Allocate one less object using html_safe during content_tag construction
  3. Merge pull request #10848 from 907th/add_block_to_cattr_reader

    rafaelfranca committed Nov 15, 2013
    Fix #10847: allow to pass a block to `cattr_reader`.
  4. Merge pull request #12900 from kuldeepaggarwal/f-to-param

    rafaelfranca committed Nov 15, 2013
    added one test case and example for ActiveRecord::Base.to_param method
  5. Merge pull request #12899 from nateberkopec/remove_broken_internal_gu…

    rafaelfranca committed Nov 15, 2013
    …ide_link
    
    Remove broken Commmand Line guide link
  6. Remove broken Commmand Line guide link

    nateberkopec committed Nov 15, 2013
    [ci skip]
  7. Unify `cattr_*` interface: allow to pass a block to `cattr_reader`.

    907th committed Jun 5, 2013
    Example:
    
        class A
          cattr_reader(:defr) { 'default_reader_value' }
        end
        A.defr # => 'default_reader_value'
  8. Merge pull request #12898 from chocoby/fix/changelog_comment

    carlosantoniodasilva committed Nov 15, 2013
    Fix CHANGELOG typo [ci skip]
  9. Avoid hash lookups for building an array of required defaults

    carlosantoniodasilva committed Nov 15, 2013
    Only set the value once after it's calculated.
  10. Fix CHANGELOG typo [ci skip]

    chocoby committed Nov 15, 2013
  11. Merge pull request #9599 from ognevsky/hash-inside-array-in-url-for

    pixeltrix committed Nov 15, 2013
    Take Hash with options inside Array in #url_for
  12. Cache regexp source on format validation to avoid allocating new objects

    carlosantoniodasilva committed Nov 15, 2013
    Example:
    
        >> r = /some-regexp/
        => /some-regexp/
        >> r.source.object_id == r.source.object_id
        => false
  13. Merge pull request #12862 from chancancode/json_gem_compat

    jeremy committed Nov 15, 2013
    JSON gem compatibility
Commits on Nov 14, 2013
  1. Improved compatibility with the stdlib JSON gem.

    chancancode committed Nov 12, 2013
    Previously, calling `::JSON.{generate,dump}` sometimes causes
    unexpected failures such as intridea/multi_json#86.
    
    `::JSON.{generate,dump}` now bypasses the ActiveSupport JSON encoder
    completely and yields the same result with or without ActiveSupport.
    This means that it will **not** call `as_json` and will ignore any
    options that the JSON gem does not natively understand. To invoke
    ActiveSupport's JSON encoder instead, use `obj.to_json(options)` or
    `ActiveSupport::JSON.encode(obj, options)`.
  2. Revert "Used Yield instead of block.call" -- this causes all of atom_…

    dhh committed Nov 14, 2013
    …feed_helper_test.rb to fail with "SystemStackError: stack level too deep".
    
    This reverts commit d3a1ce1.
  3. Fix that eager loading of polymorphic associations did not work with …

    dhh committed Nov 14, 2013
    …association empty?/any? predicates any more (there is still a problem when select is applied to a relation, or if you try association#exists? -- but its easier to work around)