Permalink
Commits on Dec 23, 2012
  1. bumping version to 3.1.9

    tenderlove committed Dec 23, 2012
  2. updating changelogs

    tenderlove committed Dec 23, 2012
Commits on Dec 15, 2012
  1. Be a bit less conservative with mysql in adapter

    This will allow the new mysql 2.9.0 to be used, fixing our test issues.
    carlosantoniodasilva committed Nov 19, 2012
  2. Update xml serialization tests to reflect a change in builder

    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.
    carlosantoniodasilva committed Sep 7, 2012
Commits on Dec 14, 2012
  1. test for 8018

    tenderlove committed Dec 14, 2012
Commits on Oct 18, 2012
  1. Require ActionController::Railtie in the default middleware stack.

    This will make possible to do a frameworkless initialization since the
    the default middleware stack is self contained.
    rafaelfranca committed Oct 18, 2012
Commits on Aug 28, 2012
  1. Ensure association preloading properly merges default scope and assoc…

    …iation conditions
    lifo committed Aug 28, 2012
  2. CHANGELOGs are now per branch

    Check 810a50d for the rationale.
    fxn committed Aug 28, 2012
Commits on Aug 17, 2012
  1. 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. 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. 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. Bump to 3.1.8

    spastorino committed Aug 9, 2012
  2. Add CHANGELOG entries

    spastorino committed Aug 9, 2012
  3. Do not mark strip_tags result as html_safe

    Thanks to Marek Labos & Nethemba
    
    CVE-2012-3465
    spastorino committed Aug 8, 2012
  4. escape select_tag :prompt values

    CVE-2012-3463
    spastorino committed Aug 8, 2012
Commits on Aug 7, 2012
Commits on Jul 26, 2012
  1. bumping to 3.1.7

    tenderlove committed Jul 26, 2012
  2. updating rails release date

    tenderlove committed Jul 26, 2012
  3. updating changelog with CVE

    tenderlove committed Jul 26, 2012
Commits on Jul 23, 2012
  1. updating changelog

    tenderlove committed Jul 23, 2012
Commits on Jun 14, 2012
  1. adding a test for #6459

    tenderlove committed Jun 14, 2012
  2. 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. updating changelogs

    tenderlove committed Jun 12, 2012
Commits on Jun 11, 2012
  1. bumping version numbers

    tenderlove committed Jun 11, 2012
  2. 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
  3. 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 6, 2012
  4. 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