Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5457 from brianmario/typo-fix | Aaron Patterson | 2012-03-15 | 1 | -1/+1 |
| | | | | Fix typo in redirect test | ||||
* | Merge pull request #5456 from brianmario/redirect-sanitization | Aaron Patterson | 2012-03-15 | 3 | -2/+22 |
| | | | | Strip null bytes from Location header | ||||
* | Merge pull request #5437 from kennyj/fix_5430 | Aaron Patterson | 2012-03-15 | 2 | -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_sequence | Aaron Patterson | 2012-03-15 | 2 | -0/+5 |
|\ | | | | | 3 2 static invalid byte sequence | ||||
| * | fix ArgumentError being raised in case of invalid byte sequences | Michael Reinsch | 2012-03-08 | 2 | -0/+5 |
| | | |||||
* | | Check for existence of exactly the called `fixture_path=` method | Piotr Sarnacki | 2012-03-15 | 1 | -2/+2 |
| | | |||||
* | | Remove ActionController::TestCase#rescue_action_in_public! | Piotr Sarnacki | 2012-03-15 | 2 | -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 Hansson | 2012-03-14 | 2 | -5/+20 |
| | | | | | | | | forms if you pass true | ||||
* | | Do not include the authenticity token in forms where remote: true as ajax ↵ | David Heinemeier Hansson | 2012-03-14 | 3 | -2/+22 |
| | | | | | | | | forms use the meta-tag value | ||||
* | | Merge pull request #5423 from jrochkind/checkout_account_for_monitor_model | Aaron Patterson | 2012-03-14 | 1 | -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 Rochkind | 2012-03-13 | 1 | -9/+18 |
|/ / | | | | | | | variables' in mutex ConditionVariables | ||||
* | | Merge pull request #5417 from kennyj/fix_5399-32 | Aaron Patterson | 2012-03-13 | 2 | -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 ↵ | kennyj | 2012-03-14 | 2 | -2/+8 |
| | | | | | | | | | | | | ActiveRecord::Base::ConnectionSpecification objects. | ||||
* | | | Close string quotes | João Britto | 2012-03-13 | 1 | -1/+1 |
| | | | |||||
* | | | Fix layout method doc formatting | Alexey Vakhov | 2012-03-13 | 1 | -2/+1 |
|/ / | |||||
* | | Merge pull request #5410 from rafaelfranca/fix-scaffold-3-2 | José Valim | 2012-03-13 | 4 | -4/+76 |
|\ \ | | | | | | | [3-2-stable] Do not use the attributes hash in the scaffold functional tests | ||||
| * | | Use Ruby 1.8 hash syntax | Rafael Mendonça França | 2012-03-13 | 3 | -9/+33 |
| | | | |||||
| * | | Use the attributes hash explicitly | Rafael Mendonça França | 2012-03-13 | 4 | -12/+44 |
| | | | |||||
| * | | Do not use the attributes hash in the scaffold functional tests | Rafael Mendonça França | 2012-03-13 | 4 | -4/+20 |
|/ / | |||||
* | | Merge pull request #5398 from parndt/fix_issue_5193 | José Valim | 2012-03-13 | 1 | -0/+5 |
|\ \ | | | | | | | Fix issue 5193 | ||||
| * | | Fixed problem when fixture_path is not always defined (incidentally, only ↵ | Philip Arndt | 2012-03-13 | 1 | -1/+3 |
| | | | | | | | | | | | | when ActiveRecord is according to test_help.rb). | ||||
| * | | Fixes issue #5193 using the instructions provided in the issue. | Philip Arndt | 2012-03-13 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #5400 from arunagw/issue_4409 | José Valim | 2012-03-13 | 2 | -1/+5 |
|\ \ \ | |/ / |/| | | Issue 4409 | ||||
| * | | fix activerecord query_method regression with offset into Fixnum | Denis Jean | 2012-03-13 | 2 | -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_use | Aaron Patterson | 2012-03-12 | 2 | -0/+26 |
| | | |||||
* | | Merge pull request #5391 from jrochkind/connection_pool_doc | Aaron Patterson | 2012-03-12 | 1 | -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 Rochkind | 2012-03-12 | 1 | -3/+1 |
| | | | | | | | | | | | | threads, it doesn't since 3.2.0 | ||||
* | | | Add documentation for find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 2 | -0/+5 |
|/ / | |||||
* | | Add dynamic find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 7 | -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-2 | José Valim | 2012-03-08 | 6 | -8/+43 |
|\ \ | | | | | | | [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict | ||||
| * | | Not need to pass join attributes to association build | Rafael Mendonça França | 2012-03-08 | 5 | -16/+21 |
| | | | |||||
| * | | Add test case to has_many through association when mass_assignment_sanitizer is | Rafael Mendonça França | 2012-03-08 | 4 | -4/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | :strict Conflicts: activerecord/test/models/person.rb | ||||
* | | | Merge pull request #5350 from rafaelfranca/changelog-fix-3-2 | Vijay Dev | 2012-03-08 | 7 | -17/+42 |
|\ \ \ | |/ / |/| | | Changelog fix 3 2 | ||||
| * | | Fix my name in the CHANGELOG to follow the convention | Rafael Mendonça França | 2012-03-09 | 7 | -17/+42 |
|/ / | | | | | | | Also add missing entries and use the formating convention | ||||
* | | ensure that released connections move between threads | Aaron Patterson | 2012-03-08 | 1 | -0/+18 |
| | | |||||
* | | make active_connection? return true only if there is an open connection in ↵ | Aaron Patterson | 2012-03-08 | 2 | -3/+46 |
| | | | | | | | | use for the current thread. fixes #5330 | ||||
* | | update changelogs for gems without changes too [ci skip] | Vijay Dev | 2012-03-09 | 5 | -2/+36 |
| | | |||||
* | | changelog updates [ci skip] | Vijay Dev | 2012-03-09 | 3 | -0/+29 |
| | | |||||
* | | In a nested resource route, the parent resource param is <resource_name>_id | Vijay Dev | 2012-03-09 | 1 | -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 :controller | coreyhaines | 2012-03-09 | 1 | -1/+1 |
| | | | | | | | | path segment | ||||
* | | Fix typo in isolated engine docs | Caius Durling | 2012-03-09 | 1 | -1/+1 |
| | | |||||
* | | Fix typo in asset pipeline guide | Matthew Conway | 2012-03-09 | 1 | -1/+1 |
| | | |||||
* | | Fix doc examples for has_and_belongs_to_many association | Braden Schaeffer | 2012-03-09 | 1 | -2/+2 |
| | | |||||
* | | Fixed a slightly misleading equivalent SQL code on the 3.2 query interface. | Swanand Pagnis | 2012-03-09 | 1 | -1/+1 |
| | | |||||
* | | typo | Mikhail Dieterle | 2012-03-09 | 1 | -1/+1 |
| | | |||||
* | | Improve docs for attr_accessible|protected related to Hash#except|slice | Carlos Antonio da Silva | 2012-03-09 | 1 | -8/+10 |
|/ | |||||
* | Add tests to test that through associations are not readonly, and we can ↵ | kuahyeow | 2012-03-08 | 1 | -0/+11 |
| | | | | update the records we retrive from the association | ||||
* | Merge pull request #5316 from Jacobkg/master | José Valim | 2012-03-07 | 2 | -1/+4 |
| | | | | Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings | ||||
* | Remove usage of deprecated module. | José Valim | 2012-03-07 | 1 | -1/+0 |
| | |||||
* | Add test case for #5307 | Carlos Antonio da Silva | 2012-03-07 | 1 | -2/+6 |
| |