Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v3.2.5
Commits on Jun 1, 2012
  1. @tenderlove

    bumping to 3.2.5

    tenderlove authored
  2. @pixeltrix

    Restore behavior of Active Record 3.2.3 scopes

    pixeltrix authored
    A series of commits relating to preloading and scopes caused a regression.
    Cloning the relation calls initialize_copy which resets a number of instance
    variables to nil. Without this the scope thinks that it is already loaded
    when it is called again.
    
    Reverts the following commits:
    13f1401
    8491740
    dffbb52
    
    Fixes #6575, #6576 & #6577
Commits on May 31, 2012
  1. @tenderlove

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

    tenderlove authored
    * 3-2-rel:
      bumping to 3.2.4
      adding security notifications to CHANGELOGs
      updating changelogs
      Merge pull request #6558 from parndt/fix_regression
  2. @tenderlove

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

    tenderlove authored
    * 3-2-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
      bumping to 3.2.4.rc1
  3. @tenderlove

    bumping to 3.2.4

    tenderlove authored
  4. @tenderlove
  5. @tenderlove

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

    tenderlove authored
    * 3-2-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
  6. @tenderlove

    updating changelogs

    tenderlove authored
  7. @rafaelfranca

    Merge pull request #6562 from martinoconnor/generator-fix-stable

    rafaelfranca authored
    3-2-stable Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
  8. Changed symbol platform to platforms for the commented out call to ge…

    Martin O'Connor authored
    …m 'therubyracer'.
    
    Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
    Updating tests.
  9. @tenderlove

    Merge pull request #6558 from parndt/fix_regression

    tenderlove authored
    Fix regression
  10. @tenderlove

    Merge pull request #6558 from parndt/fix_regression

    tenderlove authored
    Fix regression
  11. @parndt

    Revert "Removes unneeded caching from ActiveRecord::Base.relation"

    parndt authored
    This reverts commit ebfa58a.
    
    This change caused a regression in my application's tests:
    
    * Failing build http://travis-ci.org/#!/resolve/refinerycms/builds/1461242
    
    Broken tests pass after this change is reverted.
Commits on May 30, 2012
  1. @tenderlove

    Strip [nil] from parameters hash.

    tenderlove authored
    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660
  2. @tenderlove

    predicate builder should not recurse for determining where columns.

    tenderlove authored
    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661
  3. @rafaelfranca

    Merge pull request #6477 from steveklabnik/close_discovered_pg_connec…

    rafaelfranca authored
    …tion
    
    Properly discover a connection is closed in postgresql_adapter
  4. @drogus

    Merge pull request #6553 from erichmenge/3-2-stable-json-patch

    drogus authored
    3 2 stable json patch
  5. Deprecate ActiveSupport::JSON::Variable

    Erich Menge authored
  6. @tenderlove @rafaelfranca

    Merge pull request #5810 from kennyj/fix_5797

    tenderlove authored rafaelfranca committed
    Fix #5797. Error calling dup method on AR model with serialized field
    Conflicts:
    	activerecord/lib/active_record/core.rb
  7. True, False, and Nil should be represented in as_json as themselves.

    Erich Menge authored
    Conflicts:
    
    	activesupport/lib/active_support/json/encoding.rb
    	activesupport/test/json/encoding_test.rb
  8. @carlosantoniodasilva

    Merge pull request #6519 from oscardelben/3-2-stable

    carlosantoniodasilva authored
    Display annotations in coffee files
  9. @oscardelben
Commits on May 29, 2012
  1. @rafaelfranca

    Merge pull request #6531 from freerange/3-2-stable-minitest-passthrou…

    rafaelfranca authored
    …gh-exceptions
    
    Exceptions like Interrupt should not be rescued in tests.
  2. @floehopper

    Exceptions like Interrupt should not be rescued in tests.

    floehopper authored
    This is a back-port of rails/rails#6525. See the commit notes there for
    details.
Commits on May 28, 2012
  1. @tenderlove

    bumping to 3.2.4.rc1

    tenderlove authored
  2. @bkzl @oscardelben

    Display annotations from .coffee files in `rake notes`

    bkzl authored oscardelben committed
Commits on May 27, 2012
  1. @drogus

    Fix railties_order when application object is passed

    drogus authored
    railites_order method, introduced in 40b19e0, had a bug that was causing
    loading application instance twice in initializers if railties_order
    already included application instance. So for example
    
        railties_order = [Foo::Engine, :main_app, Bar::Engine]
    
    would result in such railties array:
    
        [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine]
    
    In order to fix it, we need to check for existence of application in
    both railties_order and railties arrays.
  2. @josevalim

    Merge pull request #6494 from pwim/no-memcache-require

    josevalim authored
    memcache require not needed for cache store
Commits on May 26, 2012
  1. @bdurand @pwim

    remove unnecessary memcache equire in ActionDispatch::Session::CacheS…

    bdurand authored pwim committed
    …tore
Commits on May 25, 2012
  1. @rafaelfranca

    Merge pull request #5244 from fotos/myqsl2_wait_timeout

    rafaelfranca authored
    Maximum wait_timeout on Windows is 2147483
Commits on May 24, 2012
  1. @carlosantoniodasilva

    Merge pull request #5925 from Juanmcuello/pg_structure_dump

    carlosantoniodasilva authored
    Quote arguments in db:structure:dump for PostgreSQL.
Commits on May 23, 2012
  1. @tenderlove

    Merge pull request #6467 from aselder/3-2-stable

    tenderlove authored
    Synchronize the body of the ConnectionPool#release method to improve thread safety.
  2. Synchronize the ConnectionPool#release method to avoid thread safety …

    Andrew Selder authored
    …issues [#6464]
    
    Fixes #6464
    
    Synchronize the contents of the release method in ConnectionPool due to
    errors when running in high concurrency environments.
    
        Detected invalid hash contents due to unsynchronized modifications
    with concurrent users
        org/jruby/RubyHash.java:1356:in `keys'
    /usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a
    ctive_record/connection_adapters/abstract/connection_pool.rb:294:in
    `release'
    
    /usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a
    ctive_record/connection_adapters/abstract/connection_pool.rb:282:in
    `checkin'
  3. @Juanmcuello
Commits on May 22, 2012
  1. @rafaelfranca

    Merge pull request #6451 from chancancode/3-2-stable_restore_frozen_s…

    rafaelfranca authored
    …tate_on_rollback
    
    Fixes the build break caused by 9ee8528 in #6445.
Something went wrong with that request. Please try again.