Skip to content
Commits on Apr 18, 2011
  1. @tenderlove

    bumping version for release

    tenderlove committed Apr 18, 2011
  2. @tenderlove
Commits on Apr 15, 2011
  1. @spastorino
  2. @smartinez87 @spastorino

    Added missing CHANGELOG entries for 3.0.7

    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
    smartinez87 committed with spastorino Apr 15, 2011
  3. @pixeltrix

    Add missing CHANGELOG entries

    pixeltrix committed Apr 15, 2011
  4. @jonleighton

    Update CHANGELOG

    jonleighton committed Apr 15, 2011
  5. @jonleighton

    Backport test assertions from 65469a6 (the behaviour is already the s…

    …ame, but we need to assertions to guard against regressions)
    jonleighton committed Apr 15, 2011
  6. @jonleighton

    Undo performances regressions I introduced in 36691ac and add test fo…

    …r an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."
    jonleighton committed Apr 15, 2011
  7. @jonleighton

    Return nil from read_attribute if _foo is defined, but @attributes ha…

    …s no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be.
    jonleighton committed Apr 15, 2011
  8. @jonleighton

    Remove unnecessary code from define_read_method and add assertion to …

    …make sure the underscored version is actually generated
    jonleighton committed Apr 15, 2011
Commits on Apr 14, 2011
  1. @spastorino
  2. @spastorino

    Add missing CHANGELOG entries

    spastorino committed Apr 14, 2011
  3. @stiang @tenderlove
  4. @indirect @dhh
  5. @indirect @dhh

    gsub is not needed (thanks @fxn!)

    indirect committed with dhh Apr 14, 2011
  6. @indirect @dhh

    attributes no longer disappear if a tag contains whitespace

    old:
    Hash.from_xml("<tag foo='bar'>\n</tag>")
    => {"tag"=>"\n"}
    
    new:
    Hash.from_xml("<tag foo='bar'>\n</tag>")
    => {"tag"=>{"foo"=>"bar", "__content__"=>"\n"}
    indirect committed with dhh Apr 14, 2011
Commits on Apr 5, 2011
  1. @tenderlove

    Merge branch '3-0-6' into 3-0-stable

    * 3-0-6:
      bumping version to 3.0.6
      updating CHANGELOG
      updating CHANGELOG for actionpack
      do not return html safe strings from auto_link
      bumping to 3.0.6.rc2
      Support both conventions for translations for namespaced models.
      Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
      Bring back i18n_key to avoid regression
      Revert "Improve testing of cookies in functional tests:"
      bumping version to 3.0.6.rc1
      updating AR changelog
    tenderlove committed Apr 5, 2011
  2. @tenderlove

    bumping version to 3.0.6

    tenderlove committed Apr 5, 2011
  3. @tenderlove

    updating CHANGELOG

    tenderlove committed Apr 5, 2011
  4. @tenderlove
  5. @tenderlove
  6. @joshk @josevalim

    remove AM delegating register_observer and register_interceptor to Ma…

    …il and instead implement smarter versions allowing for string class names, also added proper Railtie support with tests
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    joshk committed with josevalim Apr 4, 2011
  7. @durran @spastorino

    Destroying records via nested attributes works independent of reject_if:

    - When a :_destroy truthiness is provided in the attributes hash, the
      record should get destroyed regardless of the result of the proc or
        method supplied to :reject_if. (If :allow_destroy is true)
    
    [#6006 state:committed]
    
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
    durran committed with spastorino Apr 5, 2011
Commits on Mar 31, 2011
  1. @tenderlove

    bumping to 3.0.6.rc2

    tenderlove committed Mar 30, 2011
  2. @tenderlove

    Support both conventions for translations for namespaced models.

    3.0.0 - 3.0.1 required 'namespace/model'
    3.0.2 - 3.0.5 required 'namespace.model' (nested). It has the advantage of
    keeping the i18n file DRY when multiple models are in the same namespace,
    but can lead to translation key conflicts if models are nested within
    models.
    
    [#6448, #5572]
    John Firebaugh committed with tenderlove Mar 30, 2011
  3. @tenderlove

    Support both conventions for translations for namespaced models.

    3.0.0 - 3.0.1 required 'namespace/model'
    3.0.2 - 3.0.5 required 'namespace.model' (nested). It has the advantage of
    keeping the i18n file DRY when multiple models are in the same namespace,
    but can lead to translation key conflicts if models are nested within
    models.
    
    [#6448, #5572]
    John Firebaugh committed with tenderlove Mar 30, 2011
Commits on Mar 30, 2011
  1. @baconpat @tenderlove

    Added back the use of the Reflection module's cached sanitized_condit…

    …ions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
    baconpat committed with tenderlove Mar 28, 2011
  2. @tenderlove

    Merge branch 'eager_load_has_one_with_conditions_fix' of https://gith…

    …ub.com/baconpat/rails into baconpat-eager_load_has_one_with_conditions_fix
    
    * 'eager_load_has_one_with_conditions_fix' of https://github.com/baconpat/rails:
      Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
    tenderlove committed Mar 30, 2011
  3. @spastorino @tenderlove
  4. @spastorino
  5. @baconpat

    Added back the use of the Reflection module's cached sanitized_condit…

    …ions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
    baconpat committed Mar 28, 2011
Commits on Mar 29, 2011
  1. @tenderlove

    Revert "Improve testing of cookies in functional tests:"

    This reverts commit e2523ff.
    tenderlove committed Mar 29, 2011
  2. @josevalim
  3. @pixeltrix
  4. @pixeltrix
Something went wrong with that request. Please try again.