Permalink
Commits on Jan 20, 2012
  1. Preparing for 3.2.0 release

    dhh committed Jan 20, 2012
Commits on Jan 19, 2012
  1. update release notes [ci skip]

    vijaydev committed Jan 19, 2012
  2. Update CHANGELOG

    josevalim committed Jan 19, 2012
  3. Do not deprecate performed?

    josevalim committed Jan 19, 2012
  4. Merge pull request #4531 from exviva/pessimistic_with_lock

    Add ActiveRecord::Base#with_lock
    tenderlove committed Jan 19, 2012
  5. select doesn't take multiple arguments - fixes #4539 [ci skip]

    Didn't cherry pick the master commit because this one already had some
    of the fixes made in master.
    vijaydev committed Jan 19, 2012
Commits on Jan 18, 2012
  1. revise wording [ci skip]

    vijaydev committed Jan 18, 2012
  2. Merge pull request #4525 from guilleiguaran/am-changelog-3-2-stable

    Update AM CHANGELOG
    vijaydev committed Jan 18, 2012
  3. Update AM CHANGELOG

    guilleiguaran committed Jan 18, 2012
  4. updates to 3.2 release notes

    vijaydev committed Jan 18, 2012
  5. Merge pull request #4518 from guilleiguaran/silent-sprockets-logger-3…

    …-2-stable
    
    Silent Sprockets logger when config.assets.logger is set to false (3-2-stable)
    josevalim committed Jan 18, 2012
Commits on Jan 17, 2012
  1. Merge pull request #4498 from carlosantoniodasilva/action-controller-…

    …refactor-3-2
    
    Action controller refactor - deprecate Compatibility module
    josevalim committed Jan 17, 2012
  2. Update changelog

    carlosantoniodasilva committed Jan 17, 2012
  3. Remove duplicated constant definition

    ActionController::ActionControllerError is already defined in
    action_controller/metal/exceptions.
    carlosantoniodasilva committed Jan 17, 2012
  4. Deprecate AC::UnknownError and AC::DoubleRenderError

    Use the constants AbstractController::ActionNotFound and
    AbstractController::DoubleRenderError respectively instead.
    carlosantoniodasilva committed Jan 17, 2012
  5. Merge pull request #4487 from sarenji/fix-reset-counters

    Fix bug where reset_counters resets the wrong counter cache.
    tenderlove committed Jan 17, 2012
  6. Merge pull request #4501 from rafaelfranca/assets-logger-3-2

    Add option to configure Sprockets logger [3-2-stable]
    josevalim committed Jan 17, 2012
  7. Merge pull request #4492 from pkondzior/3-2-stable

    Wrong behavior of ActiveModel::Errors#dup is causing regressions on applications using Rails 3-2-stable
    drogus committed Jan 17, 2012
  8. Fix ActiveModel::Errors#dup

    Since ActiveModel::Errors instance keeps all error messages as hash
    we should duplicate this object as well.
    
    Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash,
    which results in different behavior on dup, this may result in regression for
    people relying on it.
    
    Because Rails 3.2 stills supports Ruby 1.8.7 in order to properly fix this
    regression we need to backport #initialize_dup.
    pkondzior committed Jan 17, 2012