Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: render_templat…
Commits on Mar 15, 2012
  1. Test for #5440

    authored
Commits on Mar 14, 2012
  1. @dhh

    Allow you to force the authenticity_token to be rendered even on remo…

    dhh authored
    …te forms if you pass true
  2. @dhh

    Do not include the authenticity token in forms where remote: true as …

    dhh authored
    …ajax forms use the meta-tag value
  3. @tenderlove

    Merge pull request #5423 from jrochkind/checkout_account_for_monitor_…

    tenderlove authored
    …model
    
    ConnectionPool.checkout needs to be restructured to take account of ruby's "non-blocking" strategy for mutex ConditionVariables
Commits on Mar 13, 2012
  1. @jrochkind

    ConnectionPool.checkout takes account of ruby using 'non-blocking con…

    jrochkind authored
    …dition variables' in mutex ConditionVariables
  2. @tenderlove

    Merge pull request #5417 from kennyj/fix_5399-32

    tenderlove authored
    [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
  3. @britto @vijaydev

    Close string quotes

    britto authored vijaydev committed
  4. @avakhov @vijaydev

    Fix layout method doc formatting

    avakhov authored vijaydev committed
  5. @kennyj

    [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::…

    kennyj authored
    …Base::ConnectionSpecification objects.
  6. @josevalim

    Merge pull request #5410 from rafaelfranca/fix-scaffold-3-2

    josevalim authored
    [3-2-stable] Do not use the attributes hash in the scaffold functional tests
  7. @rafaelfranca

    Use Ruby 1.8 hash syntax

    rafaelfranca authored
  8. @rafaelfranca
  9. @rafaelfranca
  10. @josevalim

    Merge pull request #5398 from parndt/fix_issue_5193

    josevalim authored
    Fix issue 5193
  11. @josevalim

    Merge pull request #5400 from arunagw/issue_4409

    josevalim authored
    Issue 4409
  12. @denisj @arunagw

    fix activerecord query_method regression with offset into Fixnum

    denisj authored arunagw committed
    add test to show offset query_methods on mysql & mysql2
    
    change test to cover public API
  13. @parndt

    Fixed problem when fixture_path is not always defined (incidentally, …

    parndt authored
    …only when ActiveRecord is according to test_help.rb).
  14. @parndt
Commits on Mar 12, 2012
  1. @tenderlove
  2. @tenderlove

    Merge pull request #5391 from jrochkind/connection_pool_doc

    tenderlove authored
    ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
  3. @jrochkind

    inline docs for clear_active_connections! no longer says it cleans de…

    jrochkind authored
    …ad threads, it doesn't since 3.2.0
  4. @pixeltrix
  5. @pixeltrix

    Add dynamic find_or_create_by_{attribute}! method.

    pixeltrix authored
    (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d)
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/dynamic_finder_match.rb
Commits on Mar 9, 2012
  1. @josevalim

    Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2

    josevalim authored
    [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict
  2. @vijaydev
  3. @rafaelfranca

    Fix my name in the CHANGELOG to follow the convention

    rafaelfranca authored
    Also add missing entries and use the formating convention
  4. @rafaelfranca
  5. @rafaelfranca

    Add test case to has_many through association when mass_assignment_sa…

    rafaelfranca authored
    …nitizer is
    
    :strict
    
    Conflicts:
    
    	activerecord/test/models/person.rb
  6. @tenderlove
Commits on Mar 8, 2012
  1. @tenderlove

    make active_connection? return true only if there is an open connecti…

    tenderlove authored
    …on in use for the current thread. fixes #5330
  2. @vijaydev
  3. @vijaydev

    changelog updates [ci skip]

    vijaydev authored
  4. @vijaydev

    In a nested resource route, the parent resource param is <resource_na…

    vijaydev authored
    …me>_id
    
    This fix was made by @coreyhaines on docrails and merged in master.
    Cleanly cherry picking into 3-2-stable wasn't possible.
  5. @coreyhaines @vijaydev

    Left off a : when specifying the :namespace option for a :controller

    coreyhaines authored vijaydev committed
    path segment
  6. @caius @vijaydev

    Fix typo in isolated engine docs

    caius authored vijaydev committed
Something went wrong with that request. Please try again.