| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #5533 from mhfs/migration_blank_line_3_2 | José Valim | 2012-03-21 | 2 | -1/+2 |
|\ |
|
| * | [3-2-stable] Remove blank line from generated migration | Marcelo Silveira | 2012-03-20 | 2 | -1/+2 |
|/ |
|
* | We dont need to merge in the parameters as thats all being reset by the rack ... | David Heinemeier Hansson | 2012-03-20 | 1 | -1/+0 |
* | Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stable | José Valim | 2012-03-18 | 2 | -9/+7 |
|\ |
|
| * | Build fix for ruby1.8.7-358 | Arun Agrawal | 2012-03-19 | 2 | -9/+7 |
|/ |
|
* | Increase minimum version of mail. | Mikel Lindsaar | 2012-03-19 | 1 | -1/+1 |
* | Merge pull request #5498 from arunagw/build_fix_app_generator_test_3-2-stable | José Valim | 2012-03-18 | 1 | -1/+1 |
|\ |
|
| * | Build fix for app_generator_test.rb | Arun Agrawal | 2012-03-18 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #5493 from kennyj/fix_5435-32 | Piotr Sarnacki | 2012-03-18 | 2 | -0/+13 |
|\ |
|
| * | Fix GH #5435. db:structure:dump should be re-enable. | kennyj | 2012-03-18 | 2 | -0/+13 |
|/ |
|
* | Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform only | Piotr Sarnacki | 2012-03-17 | 1 | -1/+1 |
* | Ensure load hooks can be called more than once with different contexts. | José Valim | 2012-03-17 | 2 | -6/+35 |
* | Merge pull request #5480 from drogus/rendering-issues | José Valim | 2012-03-17 | 8 | -0/+46 |
|\ |
|
| * | Add missing test for #5308 | Piotr Sarnacki | 2012-03-17 | 3 | -0/+15 |
| * | Fix #5440 - multiple render_to_string breaks partials formats | Piotr Sarnacki | 2012-03-17 | 6 | -0/+31 |
|/ |
|
* | Merge pull request #5457 from brianmario/typo-fix | Aaron Patterson | 2012-03-15 | 1 | -1/+1 |
* | Merge pull request #5456 from brianmario/redirect-sanitization | Aaron Patterson | 2012-03-15 | 3 | -2/+22 |
* | Merge pull request #5437 from kennyj/fix_5430 | Aaron Patterson | 2012-03-15 | 2 | -1/+8 |
* | Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequence | Aaron Patterson | 2012-03-15 | 2 | -0/+5 |
|\ |
|
| * | 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 |
* | | Allow you to force the authenticity_token to be rendered even on remote forms... | David Heinemeier Hansson | 2012-03-14 | 2 | -5/+20 |
* | | Do not include the authenticity token in forms where remote: true as ajax for... | David Heinemeier Hansson | 2012-03-14 | 3 | -2/+22 |
* | | Merge pull request #5423 from jrochkind/checkout_account_for_monitor_model | Aaron Patterson | 2012-03-14 | 1 | -9/+18 |
|\ \ |
|
| * | | ConnectionPool.checkout takes account of ruby using 'non-blocking condition v... | Jonathan Rochkind | 2012-03-13 | 1 | -9/+18 |
|/ / |
|
* | | 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::Co... | kennyj | 2012-03-14 | 2 | -2/+8 |
* | | | 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 |
|\ \ |
|
| * | | 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 |
|\ \ |
|
| * | | Fixed problem when fixture_path is not always defined (incidentally, only whe... | Philip Arndt | 2012-03-13 | 1 | -1/+3 |
| * | | 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 |
|\ \ \
| |/ /
|/| | |
|
| * | | fix activerecord query_method regression with offset into Fixnum | Denis Jean | 2012-03-13 | 2 | -1/+5 |
|/ / |
|
* | | 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 |
|\ \ |
|
| * | | inline docs for clear_active_connections! no longer says it cleans dead threa... | Jonathan Rochkind | 2012-03-12 | 1 | -3/+1 |
* | | | 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 |
* | | Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2 | José Valim | 2012-03-08 | 6 | -8/+43 |
|\ \ |
|
| * | | 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 |
* | | | Merge pull request #5350 from rafaelfranca/changelog-fix-3-2 | Vijay Dev | 2012-03-08 | 7 | -17/+42 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix my name in the CHANGELOG to follow the convention | Rafael Mendonça França | 2012-03-09 | 7 | -17/+42 |
|/ / |
|
* | | ensure that released connections move between threads | Aaron Patterson | 2012-03-08 | 1 | -0/+18 |