Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 59 commits
  • 65 files changed
  • 0 comments
  • 24 contributors
Mar 08, 2012
Michael Reinsch fix ArgumentError being raised in case of invalid byte sequences 55cac81
Aaron Patterson make active_connection? return true only if there is an open connecti…
…on in use for the current thread. fixes #5330
cff19cf
Aaron Patterson ensure that released connections move between threads 94b2c8c
Rafael Mendonça França Add test case to has_many through association when mass_assignment_sa…
…nitizer is

:strict

Conflicts:

	activerecord/test/models/person.rb
7cd4063
Rafael Mendonça França Not need to pass join attributes to association build f18c054
Vijay Dev Merge pull request #5350 from rafaelfranca/changelog-fix-3-2
Changelog fix 3 2
9814420
José Valim 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
2b9041b
Mar 09, 2012
Carlos Antonio da Silva Improve docs for attr_accessible|protected related to Hash#except|slice e63f04c
Mikhail Dieterle typo 1f2224d
Swanand Pagnis Fixed a slightly misleading equivalent SQL code on the 3.2 query inte…
…rface.
30feb8c
Braden Schaeffer Fix doc examples for has_and_belongs_to_many association 357e288
Matthew Conway Fix typo in asset pipeline guide 061f8ae
Caius Durling Fix typo in isolated engine docs 22a8433
Corey Haines Left off a : when specifying the :namespace option for a :controller
path segment
df755d4
Vijay Dev In a nested resource route, the parent resource param is <resource_na…
…me>_id

This fix was made by @coreyhaines on docrails and merged in master.
Cleanly cherry picking into 3-2-stable wasn't possible.
c1a01c7
Vijay Dev changelog updates [ci skip] 3bfd651
Vijay Dev update changelogs for gems without changes too [ci skip] 263d842
Rafael Mendonça França Fix my name in the CHANGELOG to follow the convention
Also add missing entries and use the formating convention
db743ff
Mar 12, 2012
Andrew White Add dynamic find_or_create_by_{attribute}! method.
(cherry picked from commit 5282485)

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/dynamic_finder_match.rb
90d9635
Andrew White Add documentation for find_or_create_by_{attribute}! method. a01f0ab
Jonathan Rochkind inline docs for clear_active_connections! no longer says it cleans de…
…ad threads, it doesn't since 3.2.0
bb8f4c2
Aaron Patterson Merge pull request #5391 from jrochkind/connection_pool_doc
ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
da0595d
Aaron Patterson make sure connections returned after close are marked as in_use 5f26ce6
Mar 13, 2012
Philip Arndt Fixes issue #5193 using the instructions provided in the issue. f665e20
Philip Arndt Fixed problem when fixture_path is not always defined (incidentally, …
…only when ActiveRecord is according to test_help.rb).
5ef8069
Denis Jean 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
f67944e
José Valim Merge pull request #5400 from arunagw/issue_4409
Issue 4409
a9320f7
José Valim Merge pull request #5398 from parndt/fix_issue_5193
Fix issue 5193
d2ac18a
Rafael Mendonça França Do not use the attributes hash in the scaffold functional tests 5bed0e5
Rafael Mendonça França Use the attributes hash explicitly ac8469d
Rafael Mendonça França Use Ruby 1.8 hash syntax c1610eb
José Valim Merge pull request #5410 from rafaelfranca/fix-scaffold-3-2
[3-2-stable] Do not use the attributes hash in the scaffold functional tests
dfbbf31
Alexey Vakhov Fix layout method doc formatting 5f28145
João Britto Close string quotes a782fea
Aaron Patterson Merge pull request #5417 from kennyj/fix_5399-32
[3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
596ecf7
Jonathan Rochkind ConnectionPool.checkout takes account of ruby using 'non-blocking con…
…dition variables' in mutex ConditionVariables
41563b4
Mar 14, 2012
Toshinori Kajihara [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::…
…Base::ConnectionSpecification objects.
21d9c0f
Aaron Patterson 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
f2aea24
David Heinemeier Hansson Do not include the authenticity token in forms where remote: true as …
…ajax forms use the meta-tag value
16ee611
David Heinemeier Hansson Allow you to force the authenticity_token to be rendered even on remo…
…te forms if you pass true
e50abba
Mar 15, 2012
Piotr Sarnacki 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.
ccf4ff0
Piotr Sarnacki Check for existence of exactly the called `fixture_path=` method 9dfb41f
Aaron Patterson Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequence
3 2 static invalid byte sequence
f918137
Aaron Patterson Merge pull request #5437 from kennyj/fix_5430
Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
bd3e1ed
Aaron Patterson Merge pull request #5456 from brianmario/redirect-sanitization
Strip null bytes from Location header
f52ad6c
Aaron Patterson Merge pull request #5457 from brianmario/typo-fix
Fix typo in redirect test
e135ff1
Mar 17, 2012
Piotr Sarnacki 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.
1eb6189
Piotr Sarnacki Add missing test for #5308 7130f91
José Valim Merge pull request #5480 from drogus/rendering-issues
Fix for #5440
e5b46cf
José Valim Ensure load hooks can be called more than once with different contexts. c0a5b85
Piotr Sarnacki Rubyracer does not work on ruby, so add it to Gemfile with :ruby plat…
…form only
41815f5
Mar 18, 2012
Toshinori Kajihara Fix GH #5435. db:structure:dump should be re-enable. f4f9ec1
Piotr Sarnacki Merge pull request #5493 from kennyj/fix_5435-32
[3-2-stable] Fix GH #5435. db:structure:dump should be re-enable.
d9355be
Arun Agrawal Build fix for app_generator_test.rb 9451201
José Valim Merge pull request #5498 from arunagw/build_fix_app_generator_test_3-…
…2-stable

Build fix app generator test 3 2 stable
c8fbd48
José Valim Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stable
Build fix 1.8.7 3 2 stable
358333f
Mar 19, 2012
Mikel Lindsaar Increase minimum version of mail.
  Second security vulnerability found in mail file delivery method
  patched in version 2.4.4.
74b7829
Arun Agrawal Build fix for ruby1.8.7-358 fcc8743
Nick Ragaz Merge branch '3-2-stable' into role_based_params_wrapping a7b8839