Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Dec 23, 2012
  1. @tenderlove

    bumping version to 3.1.9

    tenderlove authored
  2. @tenderlove
  3. @tenderlove

    updating changelogs

    tenderlove authored
Commits on Dec 15, 2012
  1. @carlosantoniodasilva

    Be a bit less conservative with mysql in adapter

    carlosantoniodasilva authored
    This will allow the new mysql 2.9.0 to be used, fixing our test issues.
  2. @carlosantoniodasilva

    Update xml serialization tests to reflect a change in builder

    carlosantoniodasilva authored
    Due to a change in builder, nil values now generates closed tags,
    so instead of this:
    
        <pseudonyms nil=\"true\"></pseudonyms>
    
    It generates this:
    
        <pseudonyms nil=\"true\"/>
    
    Document this change in Rails so that people can track it down easily if
    necessary.
    
    Changes in Active Model, Active Record and Active Support tests.
    
    Cherry-pick of d65adc7, 77dd3be and 146eaf3. Fix build.
Commits on Aug 28, 2012
  1. @lifo
  2. @fxn

    CHANGELOGs are now per branch

    fxn authored
    Check 810a50d for the rationale.
Commits on Aug 17, 2012
  1. @jonleighton

    Increase benchmark time to 20 seconds.

    jonleighton authored
    I think that 5 seconds was a bit low for our purposes.
    
    Also enable it to be configured via env vars.
    
    We also need to scale the number of records up/down depending on how
    long we're running the benchmark for.
    
    Conflicts:
    	activerecord/examples/performance.rb
  2. @jonleighton

    Use benchmark/ips to measure AR performance

    jonleighton authored
    This means we can more easily compare numbers, and we don't have to
    specify a single N for all reports, which previously meant that some
    tests were running many more/fewer iterations than necessary.
    
    Conflicts:
    	Gemfile
    	activerecord/examples/performance.rb
Commits on Aug 9, 2012
  1. @spastorino

    Bump to 3.1.8

    spastorino authored
  2. @spastorino

    Add CHANGELOG entries

    spastorino authored
Commits on Jul 26, 2012
  1. @tenderlove

    bumping to 3.1.7

    tenderlove authored
  2. @tenderlove

    updating rails release date

    tenderlove authored
Commits on Jul 23, 2012
  1. @tenderlove

    updating changelog

    tenderlove authored
Commits on Jun 14, 2012
  1. @fxn

    removes item in the Active Record CHANGELOG

    fxn authored
    That change to update_attribute was considered
    to be too subtle and was reverted in 30ea923
    just before Rails 3 shipped. Later we introduced
    update_column (Rails 3.1).
Commits on Jun 12, 2012
  1. @tenderlove

    updating changelogs

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

    bumping version numbers

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

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

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

    Change the string to use in test case.

    kennyj authored tenderlove committed
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    	activerecord/test/cases/adapters/mysql2/schema_test.rb
  7. @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
Commits on Jun 8, 2012
  1. @ernie @tenderlove

    Additional fix for CVE-2012-2661

    ernie authored tenderlove committed
    While the patched PredicateBuilder in 3.1.5 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.1.5

    tenderlove authored
  2. @tenderlove

    updating the CHANGELOG

    tenderlove authored
  3. @tenderlove

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

    tenderlove authored
    * 3-1-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.1.5.rc1

    tenderlove authored
Commits on May 1, 2012
  1. @vijaydev
Commits on Mar 29, 2012
  1. @spastorino

    Merge pull request #5658 from yahonda/address_ora_00918_with_oracle_f…

    spastorino authored
    …or_3_1
    
    Address an error for test_has_many_through_polymorphic_has_one with Oracle
  2. @yahonda

    Address an error for test_has_many_through_polymorphic_has_one

    yahonda authored
    with Oracle for the 3-1-stable branch
  3. @arturopie

    refactor instantiate method in base, so we remove nesting if's which …

    arturopie authored
    …make the code harder to read. Minor changes to contain_all_columns in IdentityMap.
Commits on Mar 28, 2012
  1. @arturopie

    refactor the checking of the attributes of the record in IdentityMap#…

    arturopie authored
    …add, so it's more readable
  2. @arturopie

    Do not add record to identity map if the record doesn't have values f…

    arturopie authored
    …or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
Something went wrong with that request. Please try again.