Skip to content
Commits on Aug 28, 2012
  1. @lifo

    Ensure association preloading properly merges default scope and assoc…

    …iation conditions
    lifo committed Aug 28, 2012
  2. @fxn

    CHANGELOGs are now per branch

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

    Increase benchmark time to 20 seconds.

    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
    jonleighton committed Aug 17, 2012
  2. @jonleighton

    Use benchmark/ips to measure AR performance

    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
    jonleighton committed Aug 17, 2012
Commits on Aug 15, 2012
  1. @rafaelfranca
  2. @carlosantoniodasilva

    Add html_escape note to CHANGELOG

    This was added to all other branches, but 3-1 missed the entry.
    
    3-0-stable: 954e262
    3-2-stable: ae2383d
    master: 5c07be5
    carlosantoniodasilva committed Aug 15, 2012
Commits on Aug 9, 2012
  1. @spastorino

    Bump to 3.1.8

    spastorino committed Aug 9, 2012
  2. @spastorino

    Add CHANGELOG entries

    spastorino committed Aug 9, 2012
  3. @spastorino

    Do not mark strip_tags result as html_safe

    Thanks to Marek Labos & Nethemba
    
    CVE-2012-3465
    spastorino committed Aug 8, 2012
  4. @spastorino

    escape select_tag :prompt values

    CVE-2012-3463
    spastorino committed Aug 8, 2012
Commits on Aug 7, 2012
  1. @spastorino
Commits on Jul 26, 2012
  1. @tenderlove

    bumping to 3.1.7

    tenderlove committed Jul 26, 2012
  2. @tenderlove

    updating rails release date

    tenderlove committed Jul 26, 2012
  3. @tenderlove

    updating changelog with CVE

    tenderlove committed Jul 26, 2012
  4. @tenderlove
Commits on Jul 23, 2012
  1. @tenderlove

    updating changelog

    tenderlove committed Jul 23, 2012
Commits on Jun 14, 2012
  1. @tenderlove

    adding a test for #6459

    tenderlove committed Jun 14, 2012
  2. @fxn

    removes item in the Active Record CHANGELOG

    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).
    fxn committed Jun 14, 2012
Commits on Jun 12, 2012
  1. @tenderlove

    updating changelogs

    tenderlove committed Jun 12, 2012
Commits on Jun 11, 2012
  1. @tenderlove

    bumping version numbers

    tenderlove committed Jun 11, 2012
  2. @tenderlove
  3. @tenderlove
  4. @tenderlove

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

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

    Change the string to use in test case.

    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    	activerecord/test/cases/adapters/mysql2/schema_test.rb
    kennyj committed with tenderlove Mar 7, 2012
  7. @kennyj @tenderlove

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

    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
    kennyj committed with tenderlove Mar 3, 2012
  8. @tenderlove
Commits on Jun 8, 2012
  1. @ernie @tenderlove

    Additional fix for CVE-2012-2661

    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.
    ernie committed with tenderlove Jun 8, 2012
Commits on May 31, 2012
  1. @tenderlove

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

    * 3-1-rel:
      bumping to 3.1.5
      updating the CHANGELOG
      bumping to 3.1.5.rc1
    tenderlove committed May 31, 2012
  2. @tenderlove

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

    * 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
    tenderlove committed May 31, 2012
  3. @tenderlove

    bumping to 3.1.5

    tenderlove committed May 31, 2012
  4. @tenderlove

    updating the CHANGELOG

    tenderlove committed May 31, 2012
  5. @tenderlove

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

    * 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
    tenderlove committed May 31, 2012
Commits on May 30, 2012
  1. @tenderlove

    Strip [nil] from parameters hash.

    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660
    tenderlove committed May 30, 2012
  2. @tenderlove

    predicate builder should not recurse for determining where columns.

    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661
    tenderlove committed May 30, 2012
Something went wrong with that request. Please try again.