aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5525 from kennyj/fix_5411José Valim2012-03-222-1/+13
|\
| * Fix GH #5411. When precompiling, params method is undefined.kennyj2012-03-222-1/+13
* | Merge pull request #5542 from mhfs/port_5522_to_32stablePiotr Sarnacki2012-03-212-0/+21
|\|
| * [3-2-stable] Port of #5522 'Fix adding/removing field's index when generating...Marcelo Silveira2012-03-212-0/+21
|/
* Merge pull request #5533 from mhfs/migration_blank_line_3_2José Valim2012-03-212-1/+2
|\
| * [3-2-stable] Remove blank line from generated migrationMarcelo Silveira2012-03-202-1/+2
|/
* We dont need to merge in the parameters as thats all being reset by the rack ...David Heinemeier Hansson2012-03-201-1/+0
* Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stableJosé Valim2012-03-182-9/+7
|\
| * Build fix for ruby1.8.7-358Arun Agrawal2012-03-192-9/+7
|/
* Increase minimum version of mail.Mikel Lindsaar2012-03-191-1/+1
* Merge pull request #5498 from arunagw/build_fix_app_generator_test_3-2-stableJosé Valim2012-03-181-1/+1
|\
| * Build fix for app_generator_test.rbArun Agrawal2012-03-181-1/+1
|/
* Merge pull request #5493 from kennyj/fix_5435-32Piotr Sarnacki2012-03-182-0/+13
|\
| * Fix GH #5435. db:structure:dump should be re-enable.kennyj2012-03-182-0/+13
|/
* Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform onlyPiotr Sarnacki2012-03-171-1/+1
* Ensure load hooks can be called more than once with different contexts.José Valim2012-03-172-6/+35
* Merge pull request #5480 from drogus/rendering-issuesJosé Valim2012-03-178-0/+46
|\
| * Add missing test for #5308Piotr Sarnacki2012-03-173-0/+15
| * Fix #5440 - multiple render_to_string breaks partials formatsPiotr Sarnacki2012-03-176-0/+31
|/
* Merge pull request #5457 from brianmario/typo-fixAaron Patterson2012-03-151-1/+1
* Merge pull request #5456 from brianmario/redirect-sanitizationAaron Patterson2012-03-153-2/+22
* Merge pull request #5437 from kennyj/fix_5430Aaron Patterson2012-03-152-1/+8
* Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequenceAaron Patterson2012-03-152-0/+5
|\
| * 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
* | Allow you to force the authenticity_token to be rendered even on remote forms...David Heinemeier Hansson2012-03-142-5/+20
* | Do not include the authenticity token in forms where remote: true as ajax for...David Heinemeier Hansson2012-03-143-2/+22
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 18:58:06 +0000