Permalink
Commits on Aug 15, 2011
  1. Support updates with joins. Fixes #522.

    jonleighton committed Aug 8, 2011
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
    	activerecord/test/cases/relations_test.rb
  2. Merge pull request #2538 from arunagw/notifications_test_fix

    jonleighton committed Aug 15, 2011
    Notifications test fix
  3. Notification Test Fix

    arunagw committed Aug 15, 2011
  4. rake assets:precompile executes in production environment as default …

    spastorino committed Aug 15, 2011
    …if RAILS_ENV was not provided
  5. Merge pull request #2535 from arunagw/delegation_fix

    jonleighton committed Aug 15, 2011
    Delegation fix
  6. Including delegation

    arunagw committed Aug 15, 2011
Commits on Aug 14, 2011
  1. Merge pull request #2522 from arunagw/railties_test_fix

    spastorino committed Aug 14, 2011
    Railties test fix
Commits on Aug 13, 2011
  1. Merge pull request #2518 from myronmarston/fix_active_record_observer…

    spastorino committed Aug 13, 2011
    …_disabling_3-1
    
    Fix active record observer disabling for 3-1-stable
  2. Allow ActiveRecord observers to be disabled.

    myronmarston committed Aug 13, 2011
    We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on.
  3. Work around for lolruby bug. (Read on for explanation.)

    jonleighton committed Aug 13, 2011
    We were experiencing CI test failures, for example:
    
    * 3-1-stable: http://travis-ci.org/#!/rails/rails/builds/79473/L407
    * master: http://travis-ci.org/#!/rails/rails/builds/79507/L80
    
    These failures only happened on 1.8.7-p352, and we were only able to
    reproduce on the Travis CI VM worker. We even tried creating a new 32
    bit Ubuntu VM and running the tests on that, and it all worked fine.
    
    After some epic trial and error, we discovered that replacing the
    following:
    
      fuu = Marshal.load(Marshal.dump(fuu))
    
    with:
    
      marshalled = Marshal.dump(fuu)
      fuu = Marshal.load(marshalled)
    
    seemed to prevent the failure.
    
    We have NO IDEA why this is. If anyone has some great insight to
    contribute then that is welcome. Otherwise, hopefully this will just
    help us get the CI green again.
    
    Many thanks to @joshk for help with sorting this out.
  4. Merge pull request #2512 from arunagw/cant_dup_on_nil_3-1-stable

    spastorino committed Aug 13, 2011
    Cant dup on nil 3 1 stable
  5. We actually don't need a reverse_merge! here. dup removed was giving …

    arunagw committed Aug 13, 2011
    …error with nil class.
Commits on Aug 11, 2011
  1. Merge pull request #2497 from akaspick/url_for_fix

    spastorino committed Aug 11, 2011
    When calling url_for with a hash, additional (likely unwanted) values (such as :host) would be returned in the hash
  2. Merge pull request #2489 from grzuy/master

    spastorino committed Aug 11, 2011
    Remove parameters_for_url from form_tag method header
Commits on Aug 10, 2011
  1. Revert "Ensure original exception message is present in both Template…

    tenderlove committed Aug 10, 2011
    …::Error#message and Template::Error#inspect."
    
    This reverts commit 403b06e.
    
    The call to `message` calls `inspect` on our exception.  The exception
    holds a reference to the environment, and the controller.  This string
    becomes very large, and the call to `super` dups the string (in tern
    doubling the memory used).  I'm reverting this for 3.1 but leaving the
    commit on master.  We should stop holding references to so many objects
    and reduce the size of our inspect.
Commits on Aug 9, 2011
Commits on Aug 8, 2011
  1. Bump arel version

    jonleighton committed Aug 8, 2011
    Conflicts:
    
    	activerecord/activerecord.gemspec
  2. Make it the responsibility of the connection to hold onto an ARel vis…

    jonleighton committed Aug 8, 2011
    …itor for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now.
    
    Conflicts:
    
    	activerecord/lib/active_record/relation/finder_methods.rb
    	activerecord/test/cases/adapter_test.rb