aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'master' into eager-url-helpersAaron Patterson2018-09-2676-174/+276
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #30676 from artofhuman/import-assert-attrs-error-messageRafael França2018-09-262-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve error message when assign wrong attributes to modelSemyon Pupkov2018-04-282-2/+4
* | | | | | | | | Merge pull request #33983 from gmcgibbon/raise_if_fixture_path_blankRafael França2018-09-263-0/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Raise an error when loading all fixtures from nil fixture_pathGannon McGibbon2018-09-263-0/+21
* | | | | | | | | | Merge pull request #31819 from bpohoriletz/masterEileen M. Uchitelle2018-09-262-4/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | If association is a hash-like object preloading failsBohdan Pohorilets2018-09-262-4/+29
* | | | | | | | | | | Remove force parent loading when counter cache child is created/destroyedRyuta Kamizono2018-09-262-7/+7
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Revert "Remove `counter_cache_target` which is no longer called"Ryuta Kamizono2018-09-262-2/+11
* | | | | | | | | | Update counter cache in memory if parent target is existedRyuta Kamizono2018-09-262-10/+35
|/ / / / / / / / /
* | | | | | | | | Merge pull request #33987 from yahonda/specify_database_characterset_at_travisRyuta Kamizono2018-09-261-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Use the same option for create database statements between Raketask and travi...Yasuo Honda2018-09-261-4/+4
|/ / / / / / / /
* | | | | | | | Fix "warning: shadowing outer local variable - config"yuuji.yaginuma2018-09-261-2/+2
* | | | | | | | Merge pull request #33968 from gmcgibbon/stringify_db_configurationsRafael França2018-09-253-2/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Stringify database configurationsGannon McGibbon2018-09-243-2/+30
* | | | | | | | | Merge pull request #33975 from JuanitoFatas/jf.fix-test-nameRafael França2018-09-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a content_for test descriptionJuanito Fatas2018-09-251-1/+1
* | | | | | | | | | Remove `counter_cache_target` which is no longer calledRyuta Kamizono2018-09-261-10/+1
* | | | | | | | | | Fix more offencesRafael Mendonça França2018-09-253-3/+3
* | | | | | | | | | Change the empty block style to have space inside of the blockRafael Mendonça França2018-09-2560-141/+142
| | | | * | | | | | Routes from Engine Railties should not be an infinite loopAaron Patterson2018-09-262-2/+10
| | | | * | | | | | Eager load supports individual filesAaron Patterson2018-09-262-4/+8
| | | | * | | | | | Allow helpers to be deferred until the routes have been finalizedAaron Patterson2018-09-252-5/+24
| | | | * | | | | | Eagerly build the routing helper module after routes are committedAaron Patterson2018-09-257-27/+62
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #33974 from rails/remove-catch-all-from-amAaron Patterson2018-09-251-17/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | This patch removes deprecated catch-all routes from AMAaron Patterson2018-09-241-17/+7
* | | | | | | | | | Merge pull request #33973 from rails/remove-catch-allAaron Patterson2018-09-2519-78/+296
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | make bot happyAaron Patterson2018-09-244-9/+9
| * | | | | | | | | | Add hack to deal with warningsAaron Patterson2018-09-241-1/+1
| * | | | | | | | | | Remove deprecated catch-all route in the AV testsAaron Patterson2018-09-2419-78/+296
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #33977 from marshall-lee/abandon-top-supportRyuta Kamizono2018-09-2510-27/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Abandon TOP support.Vladimir Kochnev2018-09-2510-27/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #33953 from wagurano/guides_markdown_custom_header_idRafael França2018-09-242-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix rails guides markdown.rb and renderer.rb to use custom header idwagurano2018-09-232-2/+7
* | | | | | | | | | Merge pull request #33964 from pskl/masterRafael França2018-09-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Improve phrasing of one sentence in the contributing guidePascal Lamouric2018-09-241-1/+1
* | | | | | | | | | Merge pull request #33959 from eugeneius/eager_load_attribute_methodsRyuta Kamizono2018-09-252-0/+55
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Eagerly define attribute methods in productionEugene Kenny2018-09-242-0/+55
* | | | | | | | | | Merge pull request #33960 from utilum/update_minimagick_version_to_4.9.2Ryuta Kamizono2018-09-241-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | update mini_magick to the latest versionutilum2018-09-241-2/+2
|/ / / / / / / / /
* | | | | | | | | Extract `instrument` method.Kasper Timm Hansen2018-09-231-26/+11
* | | | | | | | | `Persistence#increment!` requires an attribute argument which is incrementedRyuta Kamizono2018-09-242-1/+6
* | | | | | | | | Merge pull request #33829 from mtsmfm/encode-filenameKasper Timm Hansen2018-09-2310-82/+104
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Encode Content-Disposition filenames on send_data and send_fileFumiaki MATSUSHIMA2018-09-1310-82/+104
* | | | | | | | | | Merge pull request #33949 from sjain1107/no-private-defKasper Timm Hansen2018-09-239-72/+87
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove private defSakshi Jain2018-09-239-72/+87
* | | | | | | | | | | Merge pull request #33951 from abartov/patch-1George Claghorn2018-09-231-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Added mandatory region and bucketAsaf Bartov2018-09-231-0/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #32971 from y-yagi/use_plus_operator_to_unfreeze_stringYuji Yaginuma2018-09-23101-364/+366
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Enable `Performance/UnfreezeString` copyuuji.yaginuma2018-09-23101-364/+366
|/ / / / / / / / /