aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5423 from jrochkind/checkout_account_for_monitor_modelAaron Patterson2012-03-141-9/+18
|\
| * ConnectionPool.checkout takes account of ruby using 'non-blocking condition v...Jonathan Rochkind2012-03-131-9/+18
|/
* 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::Co...kennyj2012-03-142-2/+8
* | 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
|\
| * 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
|\
| * Fixed problem when fixture_path is not always defined (incidentally, only whe...Philip Arndt2012-03-131-1/+3
| * 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
|\ \ | |/ |/|
| * fix activerecord query_method regression with offset into FixnumDenis Jean2012-03-132-1/+5
|/
* 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
|\
| * inline docs for clear_active_connections! no longer says it cleans dead threa...Jonathan Rochkind2012-03-121-3/+1
* | 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
* Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2José Valim2012-03-086-8/+43
|\
| * 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
* | Merge pull request #5350 from rafaelfranca/changelog-fix-3-2Vijay Dev2012-03-087-17/+42
|\ \ | |/ |/|
| * Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-097-17/+42
|/
* 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 us...Aaron Patterson2012-03-082-3/+46
* 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
* Left off a : when specifying the :namespace option for a :controllercoreyhaines2012-03-091-1/+1
* 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 upda...kuahyeow2012-03-081-0/+11
* Merge pull request #5316 from Jacobkg/masterJosé Valim2012-03-072-1/+4
* Remove usage of deprecated module.José Valim2012-03-071-1/+0
* Add test case for #5307Carlos Antonio da Silva2012-03-071-2/+6
* Set the rendered_format on respond_to.José Valim2012-03-071-0/+1
* Just change the formats on first render, closes #5307, closes #5308.José Valim2012-03-071-2/+7
* Deprecate ActionController::SessionManagementSantiago Pastorino2012-03-061-0/+5
* Use latest rack-cache.José Valim2012-03-061-1/+1
* Increasing minimum version of mail due to security vulnerability found in Mai...Mikel Lindsaar2012-03-061-1/+1
* Merge pull request #5299 from sikachu/3-2-stable-fix-responderJosé Valim2012-03-063-12/+49
|\
| * Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
| * Failing test for mime responder respond_with using a block.Mario Visic2012-03-051-0/+36
|/
* Fix #5069 - Protect foreign key from mass assignment throught association bui...Jean Boussier2012-03-053-1/+40
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 06:15:46 +0000