Commits on Jun 17, 2011
  1. Merge pull request #1740 from Antiarchitect/2-3-stable

    Fix OrderedHash merging with block given.
    josevalim committed Jun 17, 2011
Commits on Jun 16, 2011
Commits on Jun 9, 2011
  1. Remove deprecation warning for ActiveRecord::Errors#generate_message.…

    … This is the same API that ActiveModel ended up using and that won't be changing.
    bcardarella committed with tenderlove Jun 9, 2011
Commits on Jun 7, 2011
Commits on May 25, 2011
  1. + Switched to newer rdoc and gem package tasks (and their requires).

    + Fixed deprecated usage in gemspecs.
    Bumped the version to 2.3.12 so I could test locally with actual
    installs. If this is bad form for this project, please beat me up and
    I'll split them out.
    zenspider committed May 25, 2011
Commits on May 12, 2011
  1. Removed the bulk of the deprecations by simply not calling refresh.

    This may cause problems. I dunno.
    The real solution is to get rid of all of this mess and use gem paths properly.
    zenspider committed May 12, 2011
  2. Fixed buggy gem activation. Don't pass a dependency to gem, pass the

    name and requirement. Better, just activate the spec for the
    dependency (1.8 only)
    zenspider committed May 12, 2011
  3. Removed buggy GemDependency#requirement override. Overrides should NE…

    …VER change the semantics of the parent (returning nil if default).
    zenspider committed May 12, 2011
Commits on Apr 28, 2011
  1. Merged pull request #198 from robdimarco/2-3-stable.

    Patch for issue 6440 - Session Reset undefined method `destroy' for {}:Hash
    josevalim committed Apr 28, 2011
  2. Merged pull request #331 from daphonz/2-3-stable.

    Dynamic find_or_create_by_x_and_y always creates new records in Rails 2.3.11
    josevalim committed Apr 28, 2011
  3. Fixing dynamic finders on associations to properly send arguments to …

    …the find_by_* method. Closes issue #330.
    Commit fdfc8e3 introduced a bugfix to prevent additional values passed
    to a dynamic find_or_create_by_x methods from confusing the finder.
    This patch also broke the essential behavior of this method on an
    association by incorrectly sending arguments to the find_by_x methods.
    The finder method would always see its inputs as a single array of
    values instead of individual arguments, almost guaranteeing that the
    finder call would be incorrect, and that we'd always create a new
    record instead.
    This patch adds a splat operator to the parameter array we send along to
    the dynamic finder so that it receives its inputs correctly, and
    includes an additional test to ensure that repeated calls to
    find_or_create_by_x only creates one new record.
    daphonz committed Apr 28, 2011
Commits on Apr 14, 2011
  1. respect :expire_after option

    - it was broken after
    - there's also
    - also: maybe it worth making Rack understand :expire_after as we
    duplicate same logic in [cookie_store](
    Signed-off-by: José Valim <>
    gmarik committed with josevalim Apr 4, 2011
Commits on Mar 1, 2011
Commits on Feb 20, 2011
  1. fix incorrect version in deprecation message

    Signed-off-by: Santiago Pastorino <>
    vijaydev committed with spastorino Feb 10, 2011
Commits on Feb 9, 2011
Commits on Feb 8, 2011
  1. Prepare for the 2.3.11 release

    NZKoz committed Feb 8, 2011
  2. Change the CSRF whitelisting to only apply to get requests

    Unfortunately the previous method of browser detection and XHR whitelisting is unable to prevent requests issued from some Flash animations and Java applets.  To ease the work required to include the CSRF token in ajax requests rails now supports providing the token in a custom http header:
     X-CSRF-Token: ...
    This fixes CVE-2011-0447
    NZKoz committed Jan 17, 2011
  3. Be sure to javascript_escape the email address to prevent apostrophes…

    … inadvertently causing javascript errors.
    This fixes CVE-2011-0446
    NZKoz committed Dec 8, 2010
Commits on Feb 1, 2011
  1. fixing invalid yaml [#4418 state:resolved]

    Signed-off-by: Jeremy Kemper <>
    tenderlove committed Apr 16, 2010
Commits on Jan 19, 2011
  1. Revert "make TestCaseTest work for pre-1.9 rubies, too"

    This reverts commit 8378a44.
    jamis committed Jan 19, 2011
  2. Revert "scrub instance variables from test cases on teardown"

    This reverts commit b5cf2b4.
    jamis committed Jan 19, 2011
  3. Revert "rein in GC during tests by making them run (at most) once per…

    … second"
    This reverts commit a0c761d.
    jamis committed Jan 19, 2011
  4. rein in GC during tests by making them run (at most) once per second

    this can provide a significant performance boost during testing, by
    preventing the GC from running too frequently.
    jamis committed Jan 19, 2011
  5. scrub instance variables from test cases on teardown

    this prevents test state from accumulating, resulting in leaked
    objects and slow tests due to overactive GC.
    jamis committed Jan 19, 2011
  6. Fix doc for #check_box [#6311 state:resolved]

    Signed-off-by: Xavier Noria <>
    jrdioko committed with fxn Jan 18, 2011
Commits on Jan 10, 2011
  1. Revert "use Object#class instead of Object#type"

    This reverts commit 08d94d3.
    jeremy committed Jan 10, 2011
Commits on Jan 9, 2011
Commits on Jan 2, 2011
Commits on Dec 19, 2010