aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert the behavior of association names and `where` to be closer to 4.2Sean Griffin2015-06-271-1/+1
* Improve error messages in cookies_testeileencodes2015-06-271-3/+3
* Merge pull request #20276 from davetron5000/revert-head-on-no-templateKasper Timm Hansen2015-06-272-2/+38
|\
| * Override default_render's behavior with a blockDave Copeland2015-06-202-2/+38
* | Merge pull request #20720 from rohandaxini/patch-2Rafael Mendonça França2015-06-271-1/+1
|\ \
| * | Maintaining consistency in wordings [ci skip]Rohan Daxini2015-06-271-1/+1
|/ /
* | Merge pull request #20712 from nhodges/dev/nh/20345Rafael Mendonça França2015-06-271-2/+1
|\ \
| * | Remove `config` options from `default_options` in `railties`Nuri Hodges2015-06-261-2/+1
* | | Merge pull request #20556 from radanskoric/improve-validation-helpersRafael Mendonça França2015-06-275-7/+41
|\ \ \
| * | | Improve Validation Helpers' documentation comments and testsRadan Skoric2015-06-275-7/+41
|/ / /
* | | Merge pull request #20652 from ankit1910/change_docZachary Scott2015-06-271-2/+12
|\ \ \
| * | | Change documentation for collection.build and collection.create [ci-skip]ankit19102015-06-211-2/+12
* | | | Merge pull request #20607 from cmtonkinson/update-console-colorsRafael Mendonça França2015-06-271-8/+11
|\ \ \ \
| * | | | More granular console SQL colorationChris Tonkinson2015-06-231-8/+11
* | | | | Merge pull request #20699 from vngrs/foreign_key_with_table_name_suffix_and_p...Rafael Mendonça França2015-06-273-2/+37
|\ \ \ \ \
| * | | | | Add table name prefix and suffix support to add_foreign_key and remove_foreig...Mehmet Emin İNAÇ2015-06-253-2/+37
* | | | | | Merge pull request #20018 from sikachu/change-column-default-recorderRafael Mendonça França2015-06-2710-13/+72
|\ \ \ \ \ \
| * | | | | | Update guide for new change_column_default syntaxPrem Sichanugrist2015-06-261-6/+8
| * | | | | | Add reversible syntax for change_column_defaultPrem Sichanugrist2015-06-269-7/+64
* | | | | | | Merge pull request #20711 from fenec/fix_routes_in_guidesRafael Mendonça França2015-06-271-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Change routes.rb look in getting started [ci skip]Dmitry Pak2015-06-271-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #20714 from y-yagi/fix_file_fixture_pathRafael Mendonça França2015-06-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | correct `file_fixture_path` in plugins `test_helper.rb`yuuji.yaginuma2015-06-271-1/+1
* | | | | | | 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
|\ \ \ \ \ \ \