aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make SchemaDumper emit "id: :uuid" when appropriate. Fixes #10451.Brian Buchanan2013-05-033-2/+18
* Fix generating route from engine to other enginePiotr Sarnacki2013-05-033-1/+48
* Merge pull request #9426 from exviva/nested_attributes_reuse_existing_new_recordJon Leighton2013-05-034-11/+75
|\
| * Do not overwrite manually built records during one-to-one nested attribute as...Olek Janiszewski2013-05-034-11/+75
|/
* Merge pull request #10417 from jholton/fix_association_auto_saveJon Leighton2013-05-033-12/+34
|\
| * destroys association records before saving/inserting new association recordsJohnny Holton2013-05-023-12/+34
* | Merge pull request #10413 from vipulnsward/change_groupingCarlos Antonio da Silva2013-05-031-1/+1
|\ \
| * | Use faster Array.new instead of []*paddingVipul A M2013-05-021-1/+1
* | | Revert "Merge pull request #10433 from wangjohn/making_callbacks_more_perform...Jon Leighton2013-05-031-33/+11
* | | Work around change in how MiniTest detects SIGINFOJon Leighton2013-05-031-0/+4
* | | Fix broken mysql testJon Leighton2013-05-032-32/+22
* | | Merge pull request #10424 from markevich/fix_test_prepareRafael Mendonça França2013-05-022-3/+11
|\ \ \
| * | | rake:db:test:prepare falls back to original environment after execution.markevich2013-05-022-3/+11
* | | | Merge pull request #10433 from wangjohn/making_callbacks_more_performantRafael Mendonça França2013-05-021-11/+33
|\ \ \ \
| * | | | Improving the performance of callbacks by keeping a hash of thewangjohn2013-05-021-11/+33
|/ / / /
* | | | Merge pull request #10430 from larskanis/add_sslcompression_to_pg_adapterRafael Mendonça França2013-05-021-2/+2
|\ \ \ \
| * | | | Add parameter :sslcompression to PostgreSQL adapter.Lars Kanis2013-05-021-2/+2
* | | | | Merge pull request #10426 from tkrajcar/rescue-h1-fixCarlos Antonio da Silva2013-05-021-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add styling to h1Tim Krajcar2013-05-021-0/+6
* | | | | Merge pull request #10423 from wangjohn/refactoring_testing_rakefileRafael Mendonça França2013-05-021-18/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Refactoring the creation of TestTasks to remove code duplication.wangjohn2013-05-021-18/+4
|/ / / /
* | | | Merge pull request #10416 from tkhr/add-test-for-AR--Base#to_paramCarlos Antonio da Silva2013-05-021-1/+6
|\ \ \ \
| * | | | Add test for `AR::Base#to_param`Takehiro Adachi2013-05-021-1/+6
| | |_|/ | |/| |
* | | | Merge pull request #10412 from vipulnsward/fix_callback_test_typoCarlos Antonio da Silva2013-05-021-1/+1
|\ \ \ \
| * | | | Fix typo in testVipul A M2013-05-021-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #10414 from eiel/fix_dependencyXavier Noria2013-05-023-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixes Dependency bug in Active SupportTomohiko Himura2013-05-023-0/+3
|/ / /
* | | Remove not used module from initializable testCarlos Antonio da Silva2013-05-011-9/+1
* | | Fix failures in AS with minitest 4.7.4Carlos Antonio da Silva2013-05-011-0/+3
* | | Merge pull request #10396 from tkhr/extract-test-code-from-base_test.rbCarlos Antonio da Silva2013-05-012-73/+82
|\ \ \
| * | | Extract tests code out from AR's base_test.rb to integration_test.rbTakehiro Adachi2013-05-022-73/+82
* | | | Merge pull request #10408 from patricksrobertson/convert_activemodel_to_new_h...Rafael Mendonça França2013-05-0143-349/+351
|\ \ \ \
| * | | | Convert ActiveModel to 1.9 hash syntax.Patrick Robertson2013-05-0143-349/+351
|/ / / /
* | | | Merge pull request #7839 from chancancode/handle_aliased_attributes_in_ar_rel...Aaron Patterson2013-05-017-9/+70
|\ \ \ \
| * | | | Handle aliased attributes in ActiveRecord::Relation.Godfrey Chan2013-05-017-9/+70
* | | | | Improve docs for postgresql with uuid primary keys [ci skip]Carlos Antonio da Silva2013-05-012-9/+7
* | | | | Merge pull request #10407 from NARKOZ/encoding-constantCarlos Antonio da Silva2013-05-011-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | use constant for encodingNihad Abbasov2013-05-021-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #10404 from chadmoone/fix-pg-uuid-defaultRafael Mendonça França2013-05-012-1/+61
|\ \ \ \
| * | | | allow override of uuid_generate_v4() default by passing default: nilChad Moone2013-05-012-1/+61
| |/ / /
* | | | Merge pull request #10405 from rubys/410-betaGuillermo Iguaran2013-05-011-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Make railties version match RAILS_VERSIONSam Ruby2013-05-011-2/+2
|/ / /
* | | Merge pull request #10394 from BMorearty/remove-varargs-from-inGuillermo Iguaran2013-05-013-31/+10
|\ \ \ | |_|/ |/| |
| * | Revert the guide after removing varargs from `in?`.Brian Morearty2013-05-011-2/+1
| * | Revert "Object#in? also accepts multiple parameters"Brian Morearty2013-05-012-29/+9
* | | Fix failing AP testCarlos Antonio da Silva2013-05-011-1/+1
| |/ |/|
* | Revert "Consistent use of code syntax formatting for boolean values"Xavier Noria2013-05-011-7/+7
* | Revert "Correct formatting for remaining booleans"Xavier Noria2013-05-011-21/+21
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-0136-380/+334
|\
| * copy edits [ci skip]Vijay Dev2013-05-012-2/+2