Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v3.0.14
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
  6. @tenderlove
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

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

    tenderlove authored
    * 3-0-rel:
      bumping to 3.0.13
      updating CHANGELOGs
      bumping to 3.0.13.rc1
  2. @tenderlove

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

    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
  3. @tenderlove

    bumping to 3.0.13

    tenderlove authored
  4. @tenderlove

    updating CHANGELOGs

    tenderlove authored
  5. @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

    Strip [nil] from parameters hash.

    tenderlove authored
    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660
    
    Conflicts:
    
    	actionpack/lib/action_dispatch/http/request.rb
  2. @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 May 27, 2012
  1. @rafaelfranca
Commits on May 26, 2012
  1. @rafaelfranca

    Merge pull request #6495 from homakov/3-0-stable

    rafaelfranca authored
    auto_link shouldn't always sanitize
  2. @homakov

    do not force sanitize and whitelist protocols for auto_link

    homakov authored
    sanitize is not always required so we cannot make it. let's just
    whitelist protocols
Commits on May 25, 2012
  1. @tenderlove

    Merge pull request #6485 from homakov/3-0-stable

    tenderlove authored
    auto_link sanitize output
  2. @homakov

    auto_link final sanitize

    homakov authored
Commits on Apr 30, 2012
  1. @pixeltrix

    Lock mocha gem to fix the build

    pixeltrix authored
    New versions of mocha don't allow nil.stubs
  2. @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. @jeremy

    Merge pull request #5659 from carlosantoniodasilva/fix-build-3-0

    jeremy authored
    Fix build for branch 3-0-stable - ARes and ordered hash keys
  2. @carlosantoniodasilva
  3. @spastorino

    Merge pull request #5655 from yahonda/address_ora_00918_with_oracle_f…

    spastorino authored
    …or_3_0
    
    Address an error for test_has_many_through_polymorphic_has_one with Oracle
  4. @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 #5613 from carlosantoniodasilva/fix-build-3-0-193

    tenderlove authored
    Fix build for branch 3-0-stable - Ruby 1.9.3
  2. @josevalim @drogus

    Avoid inspecting the whole route set, closes #1525

    josevalim authored drogus committed
  3. @arunagw @carlosantoniodasilva

    Fix broken encoding test

    arunagw authored carlosantoniodasilva committed
  4. @tenderlove @carlosantoniodasilva
  5. @miloops @carlosantoniodasilva

    Use helper method here.

    miloops authored carlosantoniodasilva committed
  6. @miloops @carlosantoniodasilva
  7. @josevalim

    Merge pull request #5600 from carlosantoniodasilva/fix-build-3-0

    josevalim authored
    Fix build for branch 3-0-stable - failing in ruby 1.8.8-p358
  8. @tenderlove

    Merge pull request #2621 from icco/master

    tenderlove authored
    Issue with schema dump
Something went wrong with that request. Please try again.