Permalink
Commits on Apr 19, 2012
  1. @amatsuda @jeremy

    Be sure to correctly fetch PK name from MySQL even if the PK has some…

    … custom option
    
    Backports #5900
    
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
    	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
    amatsuda committed with jeremy Apr 19, 2012
  2. @jeremy

    Merge pull request #5898 from benedikt/3-2-stable

    Readds the fix for #5667 and back ports the regression fix from #5718
    jeremy committed Apr 19, 2012
  3. @benedikt
  4. @benedikt

    Revert "Revert "Fix #5667. Preloading should ignore scoping.""

    This reverts commit 1166d49.
    
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb
    benedikt committed Apr 19, 2012
  5. @benedikt

    Adds test to check that circular preloading does not modify Model.uns…

    …coped (as described in #5667)
    
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb
    benedikt committed Apr 3, 2012
  6. @benedikt

    Removes caching from ActiveRecord::Core::ClassMethods#relation

    The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place.
    
    The four places with calls to relations are:
    
    activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'"
    activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'"
    activerecord/lib/active_record/scoping/named.rb:38:in `scoped'"
    activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'"
    
    Conflicts:
    
    	activerecord/lib/active_record/core.rb
    benedikt committed Apr 3, 2012
  7. @jeremy

    Revert "Fix #5667. Preloading should ignore scoping."

    Causes a subtle regression where record.reload includes the default
    scope. Hard to reproduce in isolation. Seems like the relation is
    getting infected by some previous usage.
    
    This reverts commit dffbb52.
    jeremy committed Apr 19, 2012
Commits on Apr 18, 2012
  1. @spastorino
  2. @tenderlove

    Merge pull request #5894 from norman/3-2-fix-nil-logger

    Fix nil logger on 3.2
    tenderlove committed Apr 18, 2012
  3. @norman

    Check for nil logger

    norman committed Apr 18, 2012
Commits on Apr 17, 2012
  1. @jeremy

    Merge pull request #5874 from asanghi/3-2-stable

    replace ruby-debug19 with debugger on Rails 3-2 stable
    jeremy committed Apr 17, 2012
  2. Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a…

    … more maintained debugger gem
    Aditya Sanghi committed Apr 17, 2012
Commits on Apr 16, 2012
  1. @jeremy

    Merge pull request #5861 from arunagw/multi_json_fix_3-2-stable

    Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
    jeremy committed Apr 16, 2012
  2. @arunagw

    multi_json is restricted to < 1.3

    Some API changes are there above 1.3. 
    3-2-stable
    arunagw committed Apr 16, 2012
Commits on Apr 15, 2012
  1. @drogus

    Add missing require in Active Support time zones (fixes #5854)

    I also removed the other require as it's already present in
    `activesupport/core_ext/time/calculations`
    drogus committed Apr 15, 2012
Commits on Apr 13, 2012
  1. @alekseykulikov @drogus
Commits on Apr 12, 2012
  1. @vijaydev

    fix typo in readme [ci skip]

    vijaydev committed Apr 12, 2012
  2. @sikachu @vijaydev
  3. @jeremy

    Merge pull request #5820 from arunagw/more_ruby-2-0-fixes

    Update test for Ruby 2 compatibility
    jeremy committed Apr 12, 2012
  4. @tenderlove @arunagw
Commits on Apr 10, 2012
  1. @jeremy

    Merge pull request #5800 from arunagw/bigdecimal_dup

    Backport BigDecimal#duplicable? feature check from master
    jeremy committed Apr 10, 2012
  2. @tenderlove @arunagw
  3. @tenderlove @arunagw

    bigdecimal can be duped on Ruby 2.0

    Conflicts:
    
    	activesupport/test/core_ext/duplicable_test.rb
    tenderlove committed with arunagw Mar 20, 2012
  4. @tenderlove @arunagw
  5. @vijaydev

    Merge pull request #5799 from arunagw/readme_fix

    Readme fix
    vijaydev committed Apr 10, 2012
  6. @arunagw

    README fix! [skip ci]

    arunagw committed Apr 10, 2012
Commits on Apr 9, 2012
  1. @fxn

    Merge pull request #5725 from kevmoo/remove_unused_castcode

    Remove unused castcode
    fxn committed Apr 9, 2012
  2. @fxn
  3. @spastorino

    Merge pull request #5784 from rafaelfranca/default_url-3-2

    [3-2-stable] Document that default_url_options must return a hash with symbolized keys
    spastorino committed Apr 9, 2012
  4. @rafaelfranca
  5. @rafaelfranca
Commits on Apr 7, 2012
  1. @anildigital @vijaydev

    Fix 'Everyday Git' link

    anildigital committed with vijaydev Apr 6, 2012
Commits on Apr 6, 2012
  1. @vijaydev

    Merge pull request #5765 from anildigital/3-2-stable

    Update getting started guide to change Rails version to Rails 3.2
    vijaydev committed Apr 6, 2012
  2. @anildigital
Commits on Apr 4, 2012
  1. @spastorino

    Merge pull request #5737 from rafaelfranca/3-2-stable

    Fix tests of benchmark with silence equals to true
    spastorino committed Apr 4, 2012