Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 1, 2012
  1. @rafaelfranca

    Fix CHANGELOGS

    rafaelfranca authored
  2. @fxn

    removes the deprecation of update_attribute

    fxn authored
    Applying the new policy here to not deprecate stuff in point releases.
  3. @fxn

    revises the deprecation warning of update_attribute

    fxn authored
    We have decided not to drop this important method in 4.0 and give
    it a longer deprecation cycle. On the other hand we do not expect
    to have update_column around for a long time, it is going to be
    replaced in favor of update_columns.
  4. @rafaelfranca

    Revert "Deprecating composed_of in ActiveRecord"

    rafaelfranca authored
    This reverts commit 44b313b.
  5. @jonleighton

    Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."

    jonleighton authored
    This reverts commit a79bfa9.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    
    We shouldn't introducing deprecations in point releases.
    It will be deprecated in 4.0 instead.
  6. @spastorino

    Add missing CHANGELOG entries

    spastorino authored
    [ci skip]
Commits on Jul 31, 2012
  1. @rafaelfranca
Commits on Jul 30, 2012
  1. @rafaelfranca

    Revert "Add update_columns and the suggestion of using update_columns

    rafaelfranca authored
    instead of update_column"
    
    This reverts commit 9fa06c3.
    
    This reverts commit 17a64de.
    
    This reverts commit def9c85, reversing
    changes made to 6b7d26c.
    
    Reason: This was supposed to be released with 3.2.7 before the
    suggestion to use update_column. Since it was not release now is not
    good to suggest to use another method because it will confusing the
    people.
Commits on Jul 26, 2012
  1. @tenderlove

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

    tenderlove authored
    * 3-2-rel:
      updating release date
      bumping to 3.2.7
      updating the changelog
      * Do not convert digest auth strings to symbols. CVE-2012-3424
      updating the version
      updating changelogs
  2. @tenderlove

    updating release date

    tenderlove authored
  3. @parndt
Commits on Jul 20, 2012
  1. @jonleighton
Commits on Jun 18, 2012
  1. @steveklabnik

    Deprecating composed_of in ActiveRecord

    steveklabnik authored
    This feature adds a lot of complication to ActiveRecord for dubious
    value. Let's talk about what it does currently:
    
    class Customer < ActiveRecord::Base
      composed_of :balance, :class_name => "Money", :mapping => %w(balance
    amount)
    end
    
    Instead, you can do something like this:
    
        def balance
          @balance ||= Money.new(value, currency)
        end
    
        def balance=(balance)
          self[:value] = balance.value
          self[:currency] = balance.currency
          @balance = balance
        end
    
    Since that's fairly easy code to write, and doesn't need anything
    extra from the framework, if you use composed_of today, you'll
    have to add accessors/mutators like that.
    
    This feature will be removed in Rails 4.
Commits on Jun 14, 2012
  1. @fxn
Commits on Jun 12, 2012
  1. @tenderlove

    updating changelogs

    tenderlove authored
Commits on Jun 11, 2012
  1. @tenderlove
Commits on Jun 7, 2012
  1. @jonleighton

    Revert "Perf: Don't load the association for #delete_all."

    jonleighton authored
    This reverts commit b98d1e2.
    
    Closes #6609
    
    Conflicts:
    
    	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
Commits on Jun 1, 2012
  1. @rafaelfranca
Commits on May 31, 2012
  1. @tenderlove
  2. @tenderlove

    updating changelogs

    tenderlove authored
Commits on May 18, 2012
  1. @jonleighton

    Perf: Don't load the association for #delete_all.

    jonleighton authored
    Bug #6289
    
    Conflicts:
    
    	activerecord/test/cases/associations/has_many_associations_test.rb
Commits on Apr 30, 2012
  1. @rafaelfranca
Commits on Apr 19, 2012
  1. @benedikt

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

    benedikt authored
    This reverts commit 1166d49.
    
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb
  2. @jeremy

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

    jeremy authored
    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.
Commits on Mar 30, 2012
  1. @jonleighton

    Fix #5667. Preloading should ignore scoping.

    jonleighton authored
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb
Commits on Mar 12, 2012
  1. @pixeltrix

    Add dynamic find_or_create_by_{attribute}! method.

    pixeltrix authored
    (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d)
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/dynamic_finder_match.rb
Commits on Mar 9, 2012
  1. @rafaelfranca

    Fix my name in the CHANGELOG to follow the convention

    rafaelfranca authored
    Also add missing entries and use the formating convention
Commits on Mar 8, 2012
  1. @vijaydev

    changelog updates [ci skip]

    vijaydev authored
Commits on Jan 26, 2012
  1. @fxn

    CHANGELOG revision for v3.2.1

    fxn authored
  2. @fxn

    registers 2483460 in the CHANGELOG

    fxn authored
Commits on Jan 20, 2012
  1. @jonleighton

    Fix another race condition.

    jonleighton authored
    From 2c667f6.
    
    Thanks @pwnall for the heads-up.
    
    Conflicts:
    
    	activerecord/lib/active_record/core.rb
  2. @dhh

    Preparing for 3.2.0 release

    dhh authored
Commits on Jan 19, 2012
  1. @tenderlove

    Merge pull request #4531 from exviva/pessimistic_with_lock

    tenderlove authored
    Add ActiveRecord::Base#with_lock
Commits on Jan 12, 2012
  1. @spastorino

    Add CHANGELOG entry

    spastorino authored
Commits on Dec 12, 2011
  1. @bdurand

    Add ActiveSupport::Cache::NullStore to expose caching interface witho…

    bdurand authored
    …ut actually caching for development and test environments.
Something went wrong with that request. Please try again.