Skip to content
Commits on May 7, 2011
  1. @josevalim

    xml_mini_test.rb now runs.

    josevalim committed May 7, 2011
  2. @tenderlove

    Merge pull request #438 from jasonmichaelroth/ordinalize_negative_num…

    …bers
    
    ordinalize negative numbers patch
    tenderlove committed May 7, 2011
  3. @jsnrth

    ordinalize negative numbers patch

    Applied patch by Amir Manji
      rails#437 (comment)
    
    Signed-off-by: Jason <jasonmichaelroth@gmail.com>
    jsnrth committed May 7, 2011
  4. @fxn

    Merge pull request #435 from vijaydev/master

    Update README template to include info about app/assets
    fxn committed May 7, 2011
  5. @vijaydev
  6. @josevalim

    Merge pull request #434 from arunagw/changelog_doc

    Updated changelog for jdbc* adapters template.
    josevalim committed May 7, 2011
  7. @arunagw
  8. @josevalim
  9. @josevalim

    Revert "Revert the merge because tests did not pass."

    This reverts commit 886818d.
    josevalim committed May 7, 2011
  10. @josevalim

    Update CHANGELOG.

    josevalim committed May 7, 2011
  11. @josevalim

    Merge pull request #343 from asanghi/ampm

    Allow AM/PM format in datetime selectors
    josevalim committed May 7, 2011
  12. @josevalim

    Merge pull request #286 from jasoncodes/marshal_subsec

    Fix marshal round-tripping of fractional seconds (Time#subsec).
    josevalim committed May 7, 2011
  13. @josevalim
  14. @josevalim

    Merge pull request #280 from jballanc/frozen-string-strip-tags

    Stripping tags from a frozen string
    josevalim committed May 7, 2011
  15. @josevalim

    Merge pull request #275 from pk-amooma/master

    properly escape "'" to "'" for XML
    josevalim committed May 7, 2011
  16. @josevalim

    Merge pull request #263 from CvX/master

    Corrected dbconsole usage message
    josevalim committed May 7, 2011
  17. @josevalim
  18. @josevalim

    Merge pull request #248 from bigfix/enumerable_as_json

    Enumerable should pass encoding options to children in #as_json/#to_json
    josevalim committed May 7, 2011
  19. @josevalim

    Merge pull request #349 from bradley178/master

    Hash.from_xml chokes on empty CDATA
    josevalim committed May 7, 2011
  20. @josevalim

    Use .ref instead of .to_sym.

    josevalim committed May 7, 2011
Commits on May 6, 2011
  1. @fxn
  2. @josevalim

    Merge pull request #424 from gnufied/master

    Fixes around_filter from observer, github issue#329
    josevalim committed May 6, 2011
  3. @josevalim

    Revert the merge because tests did not pass.

    Revert "Merge pull request #423 from richardiux/master"
    
    This reverts commit b8f08c4, reversing
    changes made to fd9df1b.
    josevalim committed May 6, 2011
  4. @josevalim

    Merge pull request #423 from richardiux/master

    Identity Map caching bug
    josevalim committed May 6, 2011
  5. @josevalim

    Merge pull request #419 from smartinez87/avail_action

    better styling on #available_action? docs
    josevalim committed May 6, 2011
  6. @smartinez87
  7. @tenderlove

    Merge pull request #418 from myronmarston/am_observer_doc_updates

    Add documentation for new observer enable/disable feature.
    tenderlove committed May 6, 2011
  8. @richardiux

    Adding base method symbolized_sti_name to activerecord base to be use…

    …d on identity map. Identity map now considers the inheritance when creating the caching keys
    richardiux committed May 6, 2011
  9. @myronmarston
  10. @josevalim
  11. @josevalim

    Merge pull request #389 from jasonrudolph/always_flush_logger_at_exit

    Always flush logger at exit
    josevalim committed May 6, 2011
  12. @jasonrudolph
  13. @jasonrudolph

    Always flush logger at exit

    Prior to this change, running code via script/runner would demonstrate
    different logging behavior than running the same code via a rake task.
    In production mode the script/runner approach would always flush the
    logger, but the rake-based approach would not automatically flush the
    logger. This discrepancy violates the principle of least surprise, and
    it could lead to the loss of important production logging data.
    
    This change removes special-case code in the "runner" command, and
    replaces it with a general solution to ensure that the logger gets
    flushed at exit. This solution works for "runner", "console", "server",
    rake tasks, and any other process that loads the Rails environment.
    jasonrudolph committed May 4, 2011
  14. @josevalim

    Merge pull request #414 from asanghi/lh5796

    config.generators.orm = false when skipping active record. LightHouse #5796
    josevalim committed May 6, 2011
Something went wrong with that request. Please try again.