Permalink
Switch branches/tags
Commits on Jan 22, 2012
  1. Fix `$rails_rake_task` global variable warning without replacing the …

    …value of $rails_rake_task if it is already set.
    
    Fixes #4591.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
    jviney committed with josevalim Jan 21, 2012
Commits on Jan 21, 2012
  1. Merge pull request #4586 from waseem/assert_with_no_deprecation_warnings

    Assert with no deprecation warnings activesupport tests.
    josevalim committed Jan 21, 2012
  2. Remove deprecation warning from console output when running

    activesupport tests.
    waseem committed Jan 21, 2012
  3. Merge pull request #4582 from kennyj/fix_4580

    Fix  GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR
    josevalim committed Jan 21, 2012
Commits on Jan 20, 2012
  1. Fix another race condition.

    From 2c667f6.
    
    Thanks @pwnall for the heads-up.
    
    Conflicts:
    
    	activerecord/lib/active_record/core.rb
    jonleighton committed Jan 20, 2012
  2. 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. update release note: timestamps is non-null as default

    Fujimura Daisuke committed with vijaydev Jan 19, 2012
  6. 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