Permalink
Commits on Apr 23, 2012
  1. Only include Rake::DSL if it's defined.

    Joe Van Dyk committed with jeremy Apr 21, 2012
    rake < 0.9 doesn't define Rake::DSL.
  2. Merge pull request #5887 from mcrowe/document-relation-merge

    vijaydev committed Apr 23, 2012
    Add documentation to the SpawnMethods#merge method.
  3. Merge pull request #5930 from carlosantoniodasilva/generated-attribut…

    josevalim committed Apr 23, 2012
    …e-refactor
    
    Refactor GeneratedAttributes
  4. Refactor GeneratedAttributes

    carlosantoniodasilva committed Apr 23, 2012
    * Move reference? method to class to remove duplicated code
    * Move to_sym typecast from #initialize to .parse method (make it
      easier to refactor reference?), remove AS object/blank require
    * Use []= instead of merge!({})
    * Remove in? in favor of include?, remove AS object/inclusion require
Commits on Apr 21, 2012
  1. Merge pull request #5917 from oscardelben/master

    drogus committed Apr 21, 2012
    Remove circular require warning
  2. Revert "in feedback solicitation text, correct that docrails is fork,…

    vijaydev committed Apr 21, 2012
    … not branch"
    
    This reverts commit 7b7cc13.
    
    Reason: docrails isn't a rails fork. See 5444ed5
    
    [ci skip]
  3. Comma missed

    avakhov committed Apr 21, 2012
Commits on Apr 20, 2012
  1. Merge pull request #5865 from tiegz/minor_fixes

    tenderlove committed Apr 20, 2012
    Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
  2. Freeze the middleware stack after it's built

    jeremy committed Apr 20, 2012
    So apps that accidentally add middlewares later aren't unwittingly dumping them in a black hole.
    
    Closes #5911
Commits on Apr 19, 2012
  1. removed extra "you"

    RudyOnRails committed Apr 19, 2012
  2. Merge pull request #5900 from amatsuda/ar_mysql_pk_with_using_option

    jeremy committed Apr 19, 2012
    current MySQL driver fails to fetch PK name when the PK has USING option
  3. Fix broken images links

    oscardelben committed Apr 19, 2012
Commits on Apr 18, 2012