Permalink
Commits on Dec 4, 2011
  1. Merge pull request #3854 from exviva/validates_associated_marked_for_…

    …destruction
    
    Do not validate associated records marked for destruction
    josevalim committed Dec 4, 2011
  2. Do not validate associated records marked for destruction

    The main reason for this change is to fix a bug where
    `validates_associated` would prevent `accepts_nested_attributes_for`
    with `allow_destroy: true` from destroying invalid associated records.
    exviva committed Dec 4, 2011
  3. Merge pull request #3851 from ebeigarts/fix_sequence_name

    Fix sequence name with abstract classes.
    jonleighton committed Dec 4, 2011
  4. Merge branch 'explain'

    fxn committed Dec 4, 2011
  5. implements a much faster auto EXPLAIN, closes #3843 [José Valim & Xav…

    …ier Noria]
    
    This commit vastly reduces the impact of auto
    explain logging when enabled, while keeping
    a negligible cost when disabled.
    
    The first implementation was based on the idea
    of subscribing to "sql.active_record" when
    needed, and unsubscribing once done. This is
    the idea behind AR::Relation#explain. Subscribe,
    collect, unsubscribe.
    
    But with the current implementation of notifications
    unsubscribing is costly, because it wipes an internal
    cache and that puts a penalty on the next event.
    
    So we are switching to an approach where a long-running
    subscriber is listening. Instead of collecting the
    queries with a closure in a dedicated subscriber, now
    we setup a thread local.
    
    If the feature is disabled by setting the threshold
    to nil, the subscriber will call a method that does
    nothing. That's totally cheap.
    fxn committed Dec 4, 2011
  6. Merge pull request #3853 from nashby/form_for_as_option

    form_for with :as option uses "action_as" as css class and id
    josevalim committed Dec 4, 2011
  7. Merge pull request #3845 from sumbach/test-return-value-from-require

    Add tests for the return value of require
    tenderlove committed Dec 4, 2011
  8. Merge pull request #3850 from carlosantoniodasilva/readonly-attributes

    Refactor readonly attributes conditional
    josevalim committed Dec 4, 2011
  9. Merge pull request #3848 from arunagw/sqlite3_bump

    SQlite3 Bump
    fxn committed Dec 4, 2011
  10. SQlite3 Bump

    arunagw committed Dec 4, 2011
  11. Fix missing /ruby block

    jasonnoble committed Dec 4, 2011
  12. Improve readability

    jasonnoble committed Dec 4, 2011
  13. Improve readability

    jasonnoble committed Dec 4, 2011
  14. Readability improvements

    jasonnoble committed Dec 4, 2011
  15. Reword confusing section

    jasonnoble committed Dec 4, 2011