Skip to content
Commits on Dec 23, 2012
  1. @tenderlove

    bumping version to 3.1.9

    tenderlove committed Dec 23, 2012
  2. @tenderlove
  3. @tenderlove

    updating changelogs

    tenderlove committed Dec 22, 2012
Commits on Dec 15, 2012
  1. @carlosantoniodasilva

    Be a bit less conservative with mysql in adapter

    carlosantoniodasilva committed Nov 19, 2012
    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 committed Sep 7, 2012
    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.
  3. @tenderlove
Commits on Dec 14, 2012
  1. @tenderlove

    test for 8018

    tenderlove committed Dec 14, 2012
Commits on Oct 18, 2012
  1. @rafaelfranca

    Require ActionController::Railtie in the default middleware stack.

    rafaelfranca committed Oct 18, 2012
    This will make possible to do a frameworkless initialization since the
    the default middleware stack is self contained.
Commits on Aug 28, 2012
  1. @lifo

    Ensure association preloading properly merges default scope and assoc…

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

    CHANGELOGs are now per branch

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

    Increase benchmark time to 20 seconds.

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

    Add html_escape note to CHANGELOG

    carlosantoniodasilva committed Aug 15, 2012
    This was added to all other branches, but 3-1 missed the entry.
    
    3-0-stable: 954e262
    3-2-stable: ae2383d
    master: 5c07be5
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

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

    escape select_tag :prompt values

    spastorino committed Aug 8, 2012
    CVE-2012-3463
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

    fxn committed Jun 14, 2012
    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 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

    tenderlove committed Jun 11, 2012
    * 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 committed with tenderlove Mar 7, 2012
    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 committed with tenderlove Mar 3, 2012
    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
  8. @tenderlove
Something went wrong with that request. Please try again.