Permalink
Commits on Mar 14, 2012
Commits on Mar 13, 2012
  1. Fix AM Guide

    Use proc as default argument to recaculate recipients array every time
    avakhov committed Mar 13, 2012
  2. Merge pull request #5414 from nashby/select-hidden-input

    add 'include_hidden' option to select tag, closes #5402
    drogus committed Mar 13, 2012
  3. Revert "Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc con…

    …flict; an elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password""
    
    This reverts commit ddbea94.
    
    Reason: Includes non-doc changes.
    committed Mar 13, 2012
  4. Merge pull request #5416 from kennyj/fix_5399

    Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
    tenderlove committed Mar 13, 2012
  5. Fix GH #5399. connection_pools's keys are ActiveRecord::Base::Connect…

    …ionSpecification objects.
    kennyj committed Mar 13, 2012
  6. Merge pull request #5397 from rafaelfranca/fix-scaffold

    Do not use the attributes hash in the scaffold functional tests
    josevalim committed Mar 13, 2012
  7. Actually commit the change!

    dhh committed Mar 13, 2012
  8. Undo unwarranted change to coding conventions. I am not a fan of the …

    …aesthetics of private/public at the root but more importantly, we should not be changing coding conventions with almost a decades worth of history at a whim. The conventions are there to have a consistent coding style, that is their primary purpose. When there is so much existing code with the existing style, any change will have to lift an enormous burden of proof as to why its overwhelmingly superior. That is not the case here, so this is being reverted.
    dhh committed Mar 13, 2012
  9. Merge pull request #5406 from parndt/fix_issue_5193_in_master

    Fix issue #5193 in master
    josevalim committed Mar 13, 2012
  10. Merge pull request #5407 from homakov/patch-1

    'module' is reserved word. Sample of code with error - not cool.
    spastorino committed Mar 13, 2012
  11. Fixed problem when fixture_path is not always defined (incidentally, …

    …only when ActiveRecord is according to test_help.rb).
    parndt committed Mar 13, 2012
  12. Merge pull request #5404 from MarkMT/master

    Updated description of #retrieve_collector_from_mimes
    josevalim committed Mar 13, 2012
Commits on Mar 12, 2012
  1. allow people to specify custom formatters, use the default formatter …

    …in production so that PID and timestamp are logged. fixes #5388
    tenderlove committed Mar 12, 2012
  2. Remove unused method

    spastorino committed Mar 12, 2012
  3. Merge pull request #5294 from robinroestenburg/master

    Refactoring of `arel_attributes_values` method
    tenderlove committed Mar 12, 2012
  4. Merge pull request #5394 from erichmenge/master

    retrieve_cache_key should work on objects that act like arrays.
    tenderlove committed Mar 12, 2012
  5. Allow retrieve_cache_key to work on collections such as ActiveRecord:…

    …:Relation.
    Erich Menge committed Mar 12, 2012