aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20417 from dubek/fix-template-cache-call-patternKasper Timm Hansen2015-06-263-1/+36
|\
| * Improve detection of partial templates eligible for collection caching.Dov Murik2015-06-223-1/+36
* | Merge pull request #20708 from sikachu/update-pluck-suggestionZachary Scott2015-06-261-1/+1
|\ \
| * | Update .pluck documentation on uniqPrem Sichanugrist2015-06-261-1/+1
|/ /
* | Merge pull request #20677 from jmondo/decimal-default-stringSean Griffin2015-06-254-4/+9
|\ \
| * | Display decimal defaults as strings to keep precisionJohn Gesimondo2015-06-234-4/+9
* | | remove bad test.Aaron Patterson2015-06-251-4/+0
* | | Merge pull request #20697 from 5t111111/add-block-to-add_sourceGuillermo Iguaran2015-06-254-2/+36
|\ \ \
| * | | cherry-pick test and source doc from #20050Hirofumi Wakasugi2015-06-253-0/+20
| * | | modify add_source in application template to take a block for gem entriesHirofumi Wakasugi2015-06-251-2/+16
* | | | Add pending test for the great-grandparent touching bug from #19324David Heinemeier Hansson2015-06-256-0/+72
* | | | Merge pull request #20696 from y-yagi/remove_active_resource_from_instrumenta...Yves Senn2015-06-251-11/+0
|\ \ \ \ | |/ / / |/| | |
| * | | remove nonexistent hook from instrumentation guide [ci skip]yuuji.yaginuma2015-06-251-11/+0
|/ / /
* | | Merge pull request #20681 from ivantsepp/update_rails_welcome_pngRafael Mendonça França2015-06-241-0/+0
|\ \ \ | |/ / |/| |
| * | Update rails_welcome.pngIvan Tse2015-06-241-0/+0
|/ /
* | Merge pull request #20674 from yui-knk/fix/guide2Rafael Mendonça França2015-06-231-1/+1
|\ \
| * | [ci skip] Make clear what `this method` isyui-knk2015-06-241-1/+1
* | | A few documentation fixes [ci skip]Robin Dupret2015-06-233-8/+8
* | | Remove the paragraph about Rails::Server#middlewareRobin Dupret2015-06-231-18/+0
|/ /
* | Merge pull request #20673 from aditya-kapoor/correct-preload-docYves Senn2015-06-231-1/+1
|\ \
| * | [ci skip] correct for ActiveRecord::Associations::Preloader:Aditya Kapoor2015-06-231-1/+2
* | | docs, add missing closing bracket. [ci skip]Yves Senn2015-06-231-1/+1
|/ /
* | Merge pull request #20552 from jamesdabbs/belongs-to-polymorphic-force-reloadYves Senn2015-06-233-1/+10
|\ \
| * | Fix `undefined method uncached` for polymorphic belongs_to #20426James Dabbs2015-06-132-1/+2
* | | Merge pull request #20545 from dcrec1/20541Yves Senn2015-06-233-3/+39
|\ \ \
| * | | thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value for...Diego Carrion2015-06-223-3/+31
* | | | Merge pull request #20667 from y-yagi/do_not_show_failed_messagesRafael Mendonça França2015-06-222-3/+10
|\ \ \ \
| * | | | do not show "Failed tests" message when a failed test is notyuuji.yaginuma2015-06-232-3/+10
* | | | | Merge pull request #20664 from vngrs/remove_mistaken_end_from_docClaudio B.2015-06-221-1/+1
|\ \ \ \ \
| * | | | | Remove mistaken end from controller_path doc [ci skip]Mehmet Emin İNAÇ2015-06-221-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #19431 from hmarr/head-routingRafael Mendonça França2015-06-222-4/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Respect routing precedence for HEAD requestsHarry Marr2015-03-202-4/+4
* | | | | Merge pull request #20665 from vngrs/add_nodoc_to_validations_helpersRafael Mendonça França2015-06-221-1/+1
|\ \ \ \ \
| * | | | | Add nodoc to the Validations::Helpers [ci skip]Mehmet Emin İNAÇ2015-06-221-1/+1
|/ / / / /
* | | | | Merge pull request #20663 from andreynering/patch-1Rafael Mendonça França2015-06-221-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Minor fixes [ci skip]Andrey Nering2015-06-221-2/+2
|/ / / /
* | | | docs, :scissors: wrongly placed heading. [ci skip]Yves Senn2015-06-221-2/+0
* | | | refactor, don't duplicate presence validator logic.Yves Senn2015-06-221-10/+4
* | | | docs, update Active Model reference for AR length validator. [ci skip]Yves Senn2015-06-221-1/+4
* | | | AR absence validator respects `marked_for_destruction?`. Closes #20449.Yves Senn2015-06-224-0/+106
| |/ / |/| |
* | | Merge pull request #20656 from repinel/move-validations-helper-methodsYves Senn2015-06-222-10/+13
|\ \ \
| * | | Move the validations HelperMethods to its own fileRoque Pinel2015-06-212-10/+13
* | | | Merge pull request #20659 from vngrs/strong_parameters_unpermitted_parameters...Yves Senn2015-06-221-2/+4
|\ \ \ \
| * | | | Fix the documentation about ActionController::UnpermittedParameters [ci skip]Mehmet Emin İNAÇ2015-06-221-2/+4
|/ / / /
* | | | Merge pull request #20655 from y-yagi/remove_unused_variableRichard Schneeman2015-06-211-1/+0
|\ \ \ \
| * | | | remove unused variable in reporter testyuuji.yaginuma2015-06-221-1/+0
* | | | | Merge pull request #20658 from vngrs/strong_parameters_parameter_wrong_doc_fixRichard Schneeman2015-06-211-5/+5
|\ \ \ \ \
| * | | | | Fix the documentation about ActionController::ParameterMissing [ci skip]Mehmet Emin İNAÇ2015-06-221-5/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #20654 from repinel/remove-duplicate-privateRichard Schneeman2015-06-211-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove duplicate private statementRoque Pinel2015-06-211-2/+0