Permalink
Switch branches/tags
Commits on Mar 17, 2012
  1. Add missing test for #5308

    committed Mar 15, 2012
  2. Fix #5440 - multiple render_to_string breaks partials formats

    This fixes situation where rendering template to string
    sets `rendered_format` to the format rendered there.
    This is ok to have consistent formats rendered in partials,
    but it breaks on next renders if format is explicitly set
    or on last render where default format does not necessarily
    need to be the format of first rendered template.
    committed Mar 15, 2012
Commits on Mar 15, 2012
  1. Merge pull request #5457 from brianmario/typo-fix

    Fix typo in redirect test
    tenderlove committed Mar 15, 2012
  2. Merge pull request #5456 from brianmario/redirect-sanitization

    Strip null bytes from Location header
    tenderlove committed Mar 15, 2012
  3. Merge pull request #5437 from kennyj/fix_5430

    Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
    tenderlove committed Mar 15, 2012
  4. Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequence

    3 2 static invalid byte sequence
    tenderlove committed Mar 15, 2012
  5. Remove ActionController::TestCase#rescue_action_in_public!

    This method has no effect since exception handling was
    moved to middlewares and ActionController tests do not
    use any middlewares.
    committed Mar 15, 2012
Commits on Mar 14, 2012
  1. Allow you to force the authenticity_token to be rendered even on remo…

    …te forms if you pass true
    dhh committed Mar 14, 2012
  2. Do not include the authenticity token in forms where remote: true as …

    …ajax forms use the meta-tag value
    dhh committed Mar 14, 2012
  3. Merge pull request #5423 from jrochkind/checkout_account_for_monitor_…

    …model
    
    ConnectionPool.checkout needs to be restructured to take account of ruby's "non-blocking" strategy for mutex ConditionVariables
    tenderlove committed Mar 14, 2012
Commits on Mar 13, 2012
  1. ConnectionPool.checkout takes account of ruby using 'non-blocking con…

    …dition variables' in mutex ConditionVariables
    jrochkind committed Mar 13, 2012
  2. Merge pull request #5417 from kennyj/fix_5399-32

    [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
    tenderlove committed Mar 13, 2012
  3. Close string quotes

    britto committed with vijaydev Mar 8, 2012
  4. Fix layout method doc formatting

    avakhov committed with vijaydev Mar 10, 2012
  5. [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::…

    …Base::ConnectionSpecification objects.
    kennyj committed Mar 13, 2012
  6. Merge pull request #5410 from rafaelfranca/fix-scaffold-3-2

    [3-2-stable] Do not use the attributes hash in the scaffold functional tests
    josevalim committed Mar 13, 2012
  7. Use Ruby 1.8 hash syntax

    rafaelfranca committed Mar 13, 2012
  8. Merge pull request #5398 from parndt/fix_issue_5193

    Fix issue 5193
    josevalim committed Mar 13, 2012
  9. Merge pull request #5400 from arunagw/issue_4409

    Issue 4409
    josevalim committed Mar 13, 2012
  10. fix activerecord query_method regression with offset into Fixnum

    add test to show offset query_methods on mysql & mysql2
    
    change test to cover public API
    denisj committed with arunagw Jan 11, 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
Commits on Mar 12, 2012
  1. Merge pull request #5391 from jrochkind/connection_pool_doc

    ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
    tenderlove committed Mar 12, 2012
  2. inline docs for clear_active_connections! no longer says it cleans de…

    …ad threads, it doesn't since 3.2.0
    jrochkind committed Mar 12, 2012
  3. Add dynamic find_or_create_by_{attribute}! method.

    (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d)
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/dynamic_finder_match.rb
    pixeltrix committed Mar 12, 2012
Commits on Mar 9, 2012
  1. Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2

    [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict
    josevalim committed Mar 9, 2012
  2. Merge pull request #5350 from rafaelfranca/changelog-fix-3-2

    Changelog fix 3 2
    vijaydev committed Mar 9, 2012
  3. Fix my name in the CHANGELOG to follow the convention

    Also add missing entries and use the formating convention
    rafaelfranca committed Mar 9, 2012
  4. Add test case to has_many through association when mass_assignment_sa…

    …nitizer is
    
    :strict
    
    Conflicts:
    
    	activerecord/test/models/person.rb
    rafaelfranca committed Mar 5, 2012