Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Apr 19, 2012

  1. Akira Matsuda

    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 authored jeremy committed
  2. Jeremy Kemper

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

    Readds the fix for #5667 and back ports the regression fix from #5718
    jeremy authored
  3. Benedikt Deicke

    Removes unneeded caching from ActiveRecord::Base.relation

    benedikt authored
  4. Benedikt Deicke

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

    This reverts commit 1166d49.
    
    Conflicts:
    
    	activerecord/test/cases/associations/eager_test.rb
    benedikt authored
  5. Benedikt Deicke

    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 authored
  6. Benedikt Deicke

    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 authored
  7. Jeremy Kemper

    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 authored

Apr 18, 2012

  1. Santiago Pastorino

    Add hook for add_resource_route

    spastorino authored
  2. Aaron Patterson

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

    Fix nil logger on 3.2
    tenderlove authored
  3. Norman Clarke

    Check for nil logger

    norman authored

Apr 17, 2012

  1. Jeremy Kemper

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

    replace ruby-debug19 with debugger on Rails 3-2 stable
    jeremy authored
  2. Aditya Sanghi

    Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a…

    … more maintained debugger gem
    asanghi authored

Apr 16, 2012

  1. Jeremy Kemper

    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 authored
  2. Arun Agrawal

    multi_json is restricted to < 1.3

    Some API changes are there above 1.3. 
    3-2-stable
    arunagw authored

Apr 15, 2012

  1. Piotr Sarnacki

    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 authored

Apr 13, 2012

  1. Aleksey Kulikov

    "rails new -h" shows message in rails directory

    ask11 authored drogus committed

Apr 12, 2012

  1. Vijay Dev

    fix typo in readme [ci skip]

    vijaydev authored
  2. Prem Sichanugrist

    Fix code example in generator test case

    sikachu authored vijaydev committed
  3. Jeremy Kemper

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

    Update test for Ruby 2 compatibility
    jeremy authored
  4. Aaron Patterson

    test against ruby features in order to fix tests on Ruby 2.0

    tenderlove authored arunagw committed

Apr 10, 2012

  1. Jeremy Kemper

    Merge pull request #5800 from arunagw/bigdecimal_dup

    Backport BigDecimal#duplicable? feature check from master
    jeremy authored
  2. Aaron Patterson

    probably should require the objects we monkey patch.

    tenderlove authored arunagw committed
  3. Aaron Patterson

    bigdecimal can be duped on Ruby 2.0

    Conflicts:
    
    	activesupport/test/core_ext/duplicable_test.rb
    tenderlove authored arunagw committed
  4. Aaron Patterson

    add the class name to the assertion message

    tenderlove authored arunagw committed
  5. Vijay Dev

    Merge pull request #5799 from arunagw/readme_fix

    Readme fix
    vijaydev authored
  6. Arun Agrawal

    README fix! [skip ci]

    arunagw authored

Apr 09, 2012

  1. Xavier Noria

    Merge pull request #5725 from kevmoo/remove_unused_castcode

    Remove unused castcode
    fxn authored
  2. Xavier Noria

    rewords the section about default_url_options in the Action Controlle…

    …r Overview guide
    fxn authored
  3. Santiago Pastorino

    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 authored
  4. Rafael Mendonça França

    Document that default_url_options must return a hash with symbolized

    keys
    rafaelfranca authored
  5. Rafael Mendonça França

    default_url_options does not receive one argument anymore

    rafaelfranca authored

Apr 07, 2012

  1. Anil Wadghule

    Fix 'Everyday Git' link

    anildigital authored vijaydev committed

Apr 06, 2012

  1. Vijay Dev

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

    Update getting started guide to change Rails version to Rails 3.2
    vijaydev authored
  2. Anil Wadghule

    Fix Rails version in getting started guide.

    anildigital authored

Apr 04, 2012

  1. Santiago Pastorino

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

    Fix tests of benchmark with silence equals to true
    spastorino authored
Something went wrong with that request. Please try again.