Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #20741 from radar/integration_tool_doc | Rafael Mendonça França | 2015-06-30 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | integration_tool defaults to :test_unit | Ryan Bigg | 2015-06-30 | 1 | -1/+1 | |
* | | | | Merge pull request #20734 from srikanthps/master | Rafael Mendonça França | 2015-06-29 | 1 | -1/+2 | |
|\ \ \ \ | ||||||
| * | | | | To fix #20644 | Srikanth Shreenivas | 2015-06-30 | 1 | -1/+2 | |
* | | | | | Merge pull request #20739 from jordondornbos/patch-1 | Rafael Mendonça França | 2015-06-29 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix pluralization in doc [ci skip] | Jordon Dornbos | 2015-06-29 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #20735 from vngrs/minor_addition_to_getting_started | Sean Griffin | 2015-06-29 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Minor addition to getting started guide for foreign_key description of refere... | Mehmet Emin İNAÇ | 2015-06-29 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | docs, nodoc `NullPreloader` and `AlreadyLoaded`. | Yves Senn | 2015-06-29 | 1 | -2/+2 | |
* | | | | | Merge pull request #20724 from y-yagi/fix_scaffold_in_full_engine | Yves Senn | 2015-06-29 | 7 | -3/+36 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix NoMethodError that occurs when generating scaffold inside full mode engine | yuuji.yaginuma | 2015-06-28 | 7 | -3/+36 | |
* | | | | | | Merge pull request #20669 from akolomiychuk/image-path | Yves Senn | 2015-06-29 | 3 | -0/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add nil check in asset_path | Anton Kolomiychuk | 2015-06-29 | 2 | -0/+7 | |
* | | | | | | | Merge pull request #20538 from repinel/fix-render-caching-issue | Kasper Timm Hansen | 2015-06-29 | 4 | -16/+36 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Fix cache issue when different partials use the same collection | Roque Pinel | 2015-06-28 | 4 | -16/+36 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #20726 from yui-knk/fix/doc_controller | Claudio B. | 2015-06-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [ci skip] Fix action_controller_overview | yui-knk | 2015-06-28 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | updates a migration example in the Getting Started guide [ci skip] | Xavier Noria | 2015-06-28 | 1 | -5/+3 | |
* | | | | | | Revert the behavior of association names and `where` to be closer to 4.2 | Sean Griffin | 2015-06-27 | 1 | -1/+1 | |
* | | | | | | Improve error messages in cookies_test | eileencodes | 2015-06-27 | 1 | -3/+3 | |
* | | | | | | Merge pull request #20276 from davetron5000/revert-head-on-no-template | Kasper Timm Hansen | 2015-06-27 | 2 | -2/+38 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Override default_render's behavior with a block | Dave Copeland | 2015-06-20 | 2 | -2/+38 | |
* | | | | | | | Merge pull request #20720 from rohandaxini/patch-2 | Rafael Mendonça França | 2015-06-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Maintaining consistency in wordings [ci skip] | Rohan Daxini | 2015-06-27 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #20712 from nhodges/dev/nh/20345 | Rafael Mendonça França | 2015-06-27 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove `config` options from `default_options` in `railties` | Nuri Hodges | 2015-06-26 | 1 | -2/+1 | |
* | | | | | | | | Merge pull request #20556 from radanskoric/improve-validation-helpers | Rafael Mendonça França | 2015-06-27 | 5 | -7/+41 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Improve Validation Helpers' documentation comments and tests | Radan Skoric | 2015-06-27 | 5 | -7/+41 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #20652 from ankit1910/change_doc | Zachary Scott | 2015-06-27 | 1 | -2/+12 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Change documentation for collection.build and collection.create [ci-skip] | ankit1910 | 2015-06-21 | 1 | -2/+12 | |
* | | | | | | | | Merge pull request #20607 from cmtonkinson/update-console-colors | Rafael Mendonça França | 2015-06-27 | 1 | -8/+11 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | More granular console SQL coloration | Chris Tonkinson | 2015-06-23 | 1 | -8/+11 | |
* | | | | | | | | | Merge pull request #20699 from vngrs/foreign_key_with_table_name_suffix_and_p... | Rafael Mendonça França | 2015-06-27 | 3 | -2/+37 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add table name prefix and suffix support to add_foreign_key and remove_foreig... | Mehmet Emin İNAÇ | 2015-06-25 | 3 | -2/+37 | |
* | | | | | | | | | | Merge pull request #20018 from sikachu/change-column-default-recorder | Rafael Mendonça França | 2015-06-27 | 10 | -13/+72 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Update guide for new change_column_default syntax | Prem Sichanugrist | 2015-06-26 | 1 | -6/+8 | |
| * | | | | | | | | | | Add reversible syntax for change_column_default | Prem Sichanugrist | 2015-06-26 | 9 | -7/+64 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #20711 from fenec/fix_routes_in_guides | Rafael Mendonça França | 2015-06-27 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Change routes.rb look in getting started [ci skip] | Dmitry Pak | 2015-06-27 | 1 | -0/+1 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #20714 from y-yagi/fix_file_fixture_path | Rafael Mendonça França | 2015-06-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | correct `file_fixture_path` in plugins `test_helper.rb` | yuuji.yaginuma | 2015-06-27 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #20417 from dubek/fix-template-cache-call-pattern | Kasper Timm Hansen | 2015-06-26 | 3 | -1/+36 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Improve detection of partial templates eligible for collection caching. | Dov Murik | 2015-06-22 | 3 | -1/+36 | |
* | | | | | | | | | | | Merge pull request #20708 from sikachu/update-pluck-suggestion | Zachary Scott | 2015-06-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Update .pluck documentation on uniq | Prem Sichanugrist | 2015-06-26 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #20677 from jmondo/decimal-default-string | Sean Griffin | 2015-06-25 | 4 | -4/+9 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Display decimal defaults as strings to keep precision | John Gesimondo | 2015-06-23 | 4 | -4/+9 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | remove bad test. | Aaron Patterson | 2015-06-25 | 1 | -4/+0 | |
* | | | | | | | | | | Merge pull request #20697 from 5t111111/add-block-to-add_source | Guillermo Iguaran | 2015-06-25 | 4 | -2/+36 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | cherry-pick test and source doc from #20050 | Hirofumi Wakasugi | 2015-06-25 | 3 | -0/+20 |