Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jun 13, 2012
  1. @tenderlove

    3.0.15

    tenderlove authored
  2. @tenderlove
Commits on Jun 12, 2012
  1. @tenderlove

    updating changelogs

    tenderlove authored
Commits on Jun 11, 2012
  1. @tenderlove

    bumping to 3.0.14

    tenderlove authored
  2. @tenderlove
  3. @tenderlove
  4. @tenderlove

    Merge branch '3-0-stable-sec' into 3-0-stable-rel

    tenderlove authored
    * 3-0-stable-sec:
      Array parameters should not contain nil values.
      Additional fix for CVE-2012-2661
  5. @kennyj @tenderlove

    Fix GH #3163. Should quote database on mysql/mysql2.

    kennyj authored tenderlove committed
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
    	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    	activerecord/test/cases/adapters/mysql2/schema_test.rb
Commits on Jun 8, 2012
  1. @ernie @tenderlove

    Additional fix for CVE-2012-2661

    ernie authored tenderlove committed
    While the patched PredicateBuilder in 3.0.13 prevents a user
    from specifying a table name using the `table.column` format,
    it doesn't protect against the nesting of hashes changing the
    table context in the next call to build_from_hash. This fix
    covers this case as well.
Commits on May 31, 2012
  1. @tenderlove

    bumping to 3.0.13

    tenderlove authored
  2. @tenderlove

    updating CHANGELOGs

    tenderlove authored
  3. @tenderlove

    Merge branch '3-0-stable-sec' into 3-0-rel

    tenderlove authored
    * 3-0-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
Commits on May 30, 2012
  1. @tenderlove

    predicate builder should not recurse for determining where columns.

    tenderlove authored
    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661
Commits on May 28, 2012
  1. @tenderlove

    bumping to 3.0.13.rc1

    tenderlove authored
Commits on Apr 30, 2012
  1. @wycats

    Merge pull request #5044 from dracco/3-0-stable

    wycats authored
    Backport Bugfix: Stack Overflow (3-0-stable)
Commits on Mar 29, 2012
  1. @yahonda

    Address an error for test_has_many_through_polymorphic_has_one

    yahonda authored
    with Oracle for the 3-0-stable branch
Commits on Mar 27, 2012
  1. @tenderlove

    Merge pull request #2621 from icco/master

    tenderlove authored
    Issue with schema dump
Commits on Mar 23, 2012
  1. @carlosantoniodasilva
  2. @carlosantoniodasilva

    Add order to tests that rely on db ordering, to fix failing tests on pg

    carlosantoniodasilva authored
    Also skip persistente tests related to UPDATE + ORDER BY for postgresql
    
    PostgreSQL does not support updates with order by, and these tests are
    failing randomly depending on the fixture loading order now.
    
    Conflicts:
    
    	activerecord/test/cases/associations/join_model_test.rb
    	activerecord/test/cases/associations/nested_through_associations_test.rb
    	activerecord/test/cases/clone_test.rb
    	activerecord/test/cases/dup_test.rb
    	activerecord/test/cases/relations_test.rb
    	activerecord/test/cases/yaml_serialization_test.rb
Commits on Mar 1, 2012
  1. @tenderlove

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

    tenderlove authored
    * 3-0-12:
      bumping to 3.0.12
      Ensure [] respects the status of the buffer.
      updating RAILS_VERSION
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options
  2. @tenderlove

    bumping to 3.0.12

    tenderlove authored
Commits on Feb 25, 2012
  1. @noahhendrix @vijaydev

    Fixed typo in composed_of example with Money#<=>, was comparing amoun…

    noahhendrix authored vijaydev committed
    …t itself instead of other_money.amount
Commits on Feb 22, 2012
  1. @tenderlove

    updating RAILS_VERSION

    tenderlove authored
  2. @jonleighton
Commits on Feb 16, 2012
  1. @AntiTyping
Commits on Feb 15, 2012
  1. @AntiTyping
Commits on Dec 18, 2011
  1. @jonleighton
Commits on Nov 18, 2011
  1. @jonleighton
Commits on Nov 17, 2011
  1. @jonleighton

    Use broken YAML that will fail with Syck as well as Psych. Fixes test…

    jonleighton authored
    …_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.
    
    Cherry-pick from 3-1-stable: b8d4692
    
    Conflicts:
    
    	activerecord/test/cases/fixtures_test.rb
Commits on Sep 12, 2011
  1. @lifo
Commits on Sep 10, 2011
  1. @vijaydev

    fix assert message

    vijaydev authored
Commits on Sep 9, 2011
  1. @tenderlove
Commits on Sep 8, 2011
  1. @guilleiguaran
Commits on Sep 7, 2011
  1. @porras @jonleighton

    Update changelog for 'Backport "ActiveRecord::Persistence#touch shoul…

    porras authored jonleighton committed
    …d not use default_scope" (pull request #1519)'
  2. @dmitriy-kiriyenko @jonleighton
Something went wrong with that request. Please try again.