Permalink
Commits on Mar 13, 2012
  1. Merge pull request #5397 from rafaelfranca/fix-scaffold

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

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

    dhh committed Mar 13, 2012
    …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.
  4. Merge pull request #5406 from parndt/fix_issue_5193_in_master

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

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

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

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

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

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

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

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

    Erich Menge committed Mar 12, 2012
    …:Relation.
  6. Merge pull request #5375 from nertzy/assert_template_with_regexp

    tenderlove committed Mar 12, 2012
    assert_template matches against Regexp
  7. Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_sep…

    tenderlove committed Mar 12, 2012
    …arator
    
    ensure u2029 is escaped in escape_javascript helper
  8. Merge pull request #5393 from jrochkind/clear_to_reap

    tenderlove committed Mar 12, 2012
    deprecated clear_stale_active_connections! can call #reap
  9. deprecated clear_stale_active_connections! can call #reap instead of …

    jrochkind committed Mar 12, 2012
    …no-op'ing, #reap does the same thing
  10. Merge pull request #5390 from arunagw/picked_commits

    josevalim committed Mar 12, 2012
    fix activerecord query_method regression with offset into Fixnum
  11. fix activerecord query_method regression with offset into Fixnum

    denisj committed with arunagw Jan 11, 2012
    add test to show offset query_methods on mysql & mysql2
    
    change test to cover public API
  12. Merge pull request #5387 from panthomakos/autoload

    josevalim committed Mar 12, 2012
    Improved ActiveSupport::Autoload Performance
  13. Improved ActiveSupport::Autoload performance.

    panthomakos committed Mar 12, 2012
    `ActiveSupport::Autoload#autoload` performance is improved in the default
    case where a path is present. Since the full path name is not generated, it
    isn't necessary to determine the full constant name either. This results in a
    3x performance gain and reduces the number of Ruby objects generated. For a full
    benchmark check [this gist](https://gist.github.com/2020228).
Commits on Mar 11, 2012
  1. Merge pull request #5366 from parndt/fix_issue_5324

    josevalim committed Mar 11, 2012
    Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.
  2. Merge pull request #5372 from jsl/add_before_send_to_actionmailer

    josevalim committed Mar 11, 2012
    Add ability to define callbacks in ActionMailer
  3. Documented the removal of size from text_field based helpers and cols…

    parndt committed Mar 11, 2012
    …, rows from text_area helper.
  4. Add ability to define callbacks in ActionMailer using AbstractControl…

    jsl committed Mar 10, 2012
    …ler::Callbacks.
    
    Prior to this commit, there isn't a good way of adding things like
    default inline attachments to an email.  This Stack Overflow thread
    shows people using hooks like the 'default' method in ActionMailer::Base
    to call a Proc for message configuration:
    
    http://stackoverflow.com/questions/5113121/rails-use-same-attachment-for-all-emails-using-layout
    
    This has the unintended side effect of setting a message header, so it's not a good solution.
    
    This pull request adds support for message modifications by including AbstractController:Callbacks
    in ActionMailer::Base. It includes tests and documentation for the functionality
    provided by including this module.