Commits on Mar 6, 2013
  1. @tenderlove

    bumping to rc2

    tenderlove committed Mar 6, 2013
Commits on Mar 5, 2013
  1. @tenderlove

    Revert "Merge pull request #8209 from senny/backport_8176"

    This reverts commit 7240202, reversing
    changes made to e4e2bcc.
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/relation/calculations.rb
    	activerecord/test/cases/calculations_test.rb
    tenderlove committed Mar 5, 2013
  2. @spastorino @tenderlove

    Freeze columns only once per Result

    Conflicts:
    	activerecord/lib/active_record/result.rb
    spastorino committed with tenderlove Sep 20, 2012
Commits on Feb 27, 2013
  1. @steveklabnik
  2. @steveklabnik
  3. @steveklabnik

    Tighten up AS.gemspec.

    Apparently 0.6.2 has a call to force_encoding, which is not around
    in 1.8.7.
    steveklabnik committed Feb 26, 2013
  4. @steveklabnik

    CHANGELOG entry for ee291b9.

    Since we released it, it should go in the CHANGELOG.
    steveklabnik committed Feb 26, 2013
  5. @steveklabnik

    Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-nu…

    …meric"
    
    This reverts commit 921a296.
    steveklabnik committed Feb 26, 2013
Commits on Feb 26, 2013
  1. @yaotti @steveklabnik
  2. @carlosantoniodasilva
  3. @carlosantoniodasilva

    Merge pull request #9430 from authorNari/backport-7072-to-3-2-stable

    Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope
    carlosantoniodasilva committed Feb 26, 2013
  4. @authorNari
Commits on Feb 25, 2013
  1. @rafaelfranca

    Merge pull request #9408 from mikeycgto/origin/3-2-stable

    Update RUBY_VERSION check for performance testing to handle 2.0.0
    rafaelfranca committed Feb 24, 2013
  2. @mikeycgto
Commits on Feb 24, 2013
  1. @rafaelfranca

    Merge pull request #9406 from rails/3-2-stable-ruby-2

    Rails 3.2.x is now compatible with Ruby 2.0.0
    rafaelfranca committed Feb 24, 2013
  2. @sikachu
  3. @hsbt @sikachu

    added marshal_load and marshal_dump for ProxyTestResult. Behavior of …

    …method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
    hsbt committed with sikachu Dec 29, 2012
  4. @sikachu

    Do not redirect cache logger to /dev/null in test

    For some reason, redirecting cache's logger to '/dev/null' resulting in
    a test failures and LoadError. I think it's because of Thread issue.
    Instead of trying to make every logger threadsafe for Rails 3.2, I think
    it's better to just don't set the logger for now.
    
    (Note: resetting the logger back to original value in the teardown block
    didn't fix the problem.)
    sikachu committed Feb 22, 2013
  5. @jeremy @sikachu

    Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring…

    … them. No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add9
    jeremy committed with sikachu Oct 6, 2012
  6. @rafaelfranca @sikachu
  7. @sikachu

    Check for `method_missing` in public and protected

    Ruby 2.0 changed the behavior of `respond_to?` without argument to
    return only search for public method. We actually want to perform the
    action only if `method_missing` is either in public or protected.
    sikachu committed Feb 22, 2013
  8. @thedarkone @sikachu
  9. @jeremy @sikachu

    Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrop…

    …hes a few times, so fix up the test to work with however it chooses to escape.
    jeremy committed with sikachu Oct 6, 2012
  10. @tenderlove @sikachu

    Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifical…

    …ly tag this file with us-ascii
    tenderlove committed with sikachu Nov 12, 2012
  11. @tenderlove @sikachu
  12. @sikachu

    Define #inspect instead of #to_s

    Ruby 2.0 Object#inspect does not call #to_s by default anymore.
    sikachu committed Feb 21, 2013
  13. @sikachu
  14. @tenderlove @sikachu

    `name` should be public.

    tenderlove committed with sikachu May 24, 2012
  15. @sikachu

    Add in missing requires

    sikachu committed Feb 21, 2013
Commits on Feb 23, 2013
  1. @carlosantoniodasilva

    Merge pull request #9388 from senny/9367_wrong_schema_after_remove_co…

    …lumn
    
    Sqlite preserves primary keys when copying/altering tables.
    carlosantoniodasilva committed Feb 23, 2013
  2. @senny

    Sqlite preserves primary keys when copying/altering tables.

    Backport #2312.
    Fixes #9367.
    
    I also added a test-case to make sure that renaming or removing
    a column preserves the primary key.
    senny committed Feb 23, 2013
Commits on Feb 22, 2013
  1. @carlosantoniodasilva

    Use 1.8 hash style

    carlosantoniodasilva committed Feb 22, 2013
  2. @pixeltrix

    Merge pull request #9374 from senny/improved_match_shorthand_syntax

    determine the match shorthand target early.
    pixeltrix committed Feb 22, 2013
  3. @senny

    determine the match shorthand target early.

    Backport #9361.
    Closes #7554.
    
    This patch determines the `controller#action` directly
    in the `match` method when the shorthand syntax is used.
    this prevents problems with namespaces and scopes.
    senny committed Feb 21, 2013
Commits on Feb 21, 2013
  1. @carlosantoniodasilva