aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #5480 from drogus/rendering-issuesJosé Valim2012-03-178-0/+46
|\ | | | | Fix for #5440
| * Add missing test for #5308Piotr Sarnacki2012-03-173-0/+15
| |
| * Fix #5440 - multiple render_to_string breaks partials formatsPiotr Sarnacki2012-03-176-0/+31
|/ | | | | | | | | 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.
* Merge pull request #5457 from brianmario/typo-fixAaron Patterson2012-03-151-1/+1
| | | | Fix typo in redirect test
* Merge pull request #5456 from brianmario/redirect-sanitizationAaron Patterson2012-03-153-2/+22
| | | | Strip null bytes from Location header
* Merge pull request #5437 from kennyj/fix_5430Aaron Patterson2012-03-152-1/+8
| | | | Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
* Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequenceAaron Patterson2012-03-152-0/+5
|\ | | | | 3 2 static invalid byte sequence
| * fix ArgumentError being raised in case of invalid byte sequencesMichael Reinsch2012-03-082-0/+5
| |
* | Check for existence of exactly the called `fixture_path=` methodPiotr Sarnacki2012-03-151-2/+2
| |
* | Remove ActionController::TestCase#rescue_action_in_public!Piotr Sarnacki2012-03-152-10/+0
| | | | | | | | | | | | This method has no effect since exception handling was moved to middlewares and ActionController tests do not use any middlewares.
* | Allow you to force the authenticity_token to be rendered even on remote ↵David Heinemeier Hansson2012-03-142-5/+20
| | | | | | | | forms if you pass true
* | Do not include the authenticity token in forms where remote: true as ajax ↵David Heinemeier Hansson2012-03-143-2/+22
| | | | | | | | forms use the meta-tag value
* | Merge pull request #5423 from jrochkind/checkout_account_for_monitor_modelAaron Patterson2012-03-141-9/+18
|\ \ | | | | | | ConnectionPool.checkout needs to be restructured to take account of ruby's "non-blocking" strategy for mutex ConditionVariables
| * | ConnectionPool.checkout takes account of ruby using 'non-blocking condition ↵Jonathan Rochkind2012-03-131-9/+18
|/ / | | | | | | variables' in mutex ConditionVariables
* | Merge pull request #5417 from kennyj/fix_5399-32Aaron Patterson2012-03-132-2/+8
|\ \ | | | | | | [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
| * | [3-2-stable] Fix GH #5399. connection_pools's keys are ↵kennyj2012-03-142-2/+8
| | | | | | | | | | | | ActiveRecord::Base::ConnectionSpecification objects.
* | | Close string quotesJoão Britto2012-03-131-1/+1
| | |
* | | Fix layout method doc formattingAlexey Vakhov2012-03-131-2/+1
|/ /
* | Merge pull request #5410 from rafaelfranca/fix-scaffold-3-2José Valim2012-03-134-4/+76
|\ \ | | | | | | [3-2-stable] Do not use the attributes hash in the scaffold functional tests
| * | Use Ruby 1.8 hash syntaxRafael Mendonça França2012-03-133-9/+33
| | |
| * | Use the attributes hash explicitlyRafael Mendonça França2012-03-134-12/+44
| | |
| * | Do not use the attributes hash in the scaffold functional testsRafael Mendonça França2012-03-134-4/+20
|/ /
* | Merge pull request #5398 from parndt/fix_issue_5193José Valim2012-03-131-0/+5
|\ \ | | | | | | Fix issue 5193
| * | Fixed problem when fixture_path is not always defined (incidentally, only ↵Philip Arndt2012-03-131-1/+3
| | | | | | | | | | | | when ActiveRecord is according to test_help.rb).
| * | Fixes issue #5193 using the instructions provided in the issue.Philip Arndt2012-03-131-0/+3
| | |
* | | Merge pull request #5400 from arunagw/issue_4409José Valim2012-03-132-1/+5
|\ \ \ | |/ / |/| | Issue 4409
| * | fix activerecord query_method regression with offset into FixnumDenis Jean2012-03-132-1/+5
|/ / | | | | | | | | | | add test to show offset query_methods on mysql & mysql2 change test to cover public API
* | make sure connections returned after close are marked as in_useAaron Patterson2012-03-122-0/+26
| |
* | Merge pull request #5391 from jrochkind/connection_pool_docAaron Patterson2012-03-121-3/+1
|\ \ | | | | | | ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
| * | inline docs for clear_active_connections! no longer says it cleans dead ↵Jonathan Rochkind2012-03-121-3/+1
| | | | | | | | | | | | threads, it doesn't since 3.2.0
* | | Add documentation for find_or_create_by_{attribute}! method.Andrew White2012-03-122-0/+5
|/ /
* | Add dynamic find_or_create_by_{attribute}! method.Andrew White2012-03-127-1/+67
| | | | | | | | | | | | | | | | | | (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/dynamic_finder_match.rb
* | Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2José Valim2012-03-086-8/+43
|\ \ | | | | | | [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict
| * | Not need to pass join attributes to association buildRafael Mendonça França2012-03-085-16/+21
| | |
| * | Add test case to has_many through association when mass_assignment_sanitizer isRafael Mendonça França2012-03-084-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | :strict Conflicts: activerecord/test/models/person.rb
* | | Merge pull request #5350 from rafaelfranca/changelog-fix-3-2Vijay Dev2012-03-087-17/+42
|\ \ \ | |/ / |/| | Changelog fix 3 2
| * | Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-097-17/+42
|/ / | | | | | | Also add missing entries and use the formating convention
* | ensure that released connections move between threadsAaron Patterson2012-03-081-0/+18
| |
* | make active_connection? return true only if there is an open connection in ↵Aaron Patterson2012-03-082-3/+46
| | | | | | | | use for the current thread. fixes #5330
* | update changelogs for gems without changes too [ci skip]Vijay Dev2012-03-095-2/+36
| |
* | changelog updates [ci skip]Vijay Dev2012-03-093-0/+29
| |
* | In a nested resource route, the parent resource param is <resource_name>_idVijay Dev2012-03-091-8/+8
| | | | | | | | | | This fix was made by @coreyhaines on docrails and merged in master. Cleanly cherry picking into 3-2-stable wasn't possible.
* | Left off a : when specifying the :namespace option for a :controllercoreyhaines2012-03-091-1/+1
| | | | | | | | path segment
* | Fix typo in isolated engine docsCaius Durling2012-03-091-1/+1
| |
* | Fix typo in asset pipeline guideMatthew Conway2012-03-091-1/+1
| |
* | Fix doc examples for has_and_belongs_to_many associationBraden Schaeffer2012-03-091-2/+2
| |
* | Fixed a slightly misleading equivalent SQL code on the 3.2 query interface.Swanand Pagnis2012-03-091-1/+1
| |
* | typoMikhail Dieterle2012-03-091-1/+1
| |
* | Improve docs for attr_accessible|protected related to Hash#except|sliceCarlos Antonio da Silva2012-03-091-8/+10
|/
* Add tests to test that through associations are not readonly, and we can ↵kuahyeow2012-03-081-0/+11
| | | | update the records we retrive from the association
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:12:21 +0000