aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #34003 from palkan/fix/cable-test-case-rails5-hackRafael França2018-09-271-6/+2
|\
| * Remove Rails 5.0 workaround from ActionCable::Channel::TestCaseVladimir Dementyev2018-09-271-6/+2
* | Merge pull request #33986 from matt17r/patch-1Gannon McGibbon2018-09-271-1/+1
|\ \
| * | Add missing rdoc +code+ tagsMatthew LS2018-09-261-1/+1
* | | Make `update_all` preparableRyuta Kamizono2018-09-282-2/+18
* | | Merge pull request #33979 from lzap/masterRafael França2018-09-272-0/+26
|\ \ \
| * | | Added ActionController::Parameters.each_value methodLukas Zapletal2018-09-272-0/+26
* | | | Merge pull request #31604 from fatkodima/reverting-transactionEileen M. Uchitelle2018-09-277-5/+86
|\ \ \ \
| * | | | Fix `transaction` reverting for migrationsfatkodima2018-09-267-5/+86
* | | | | Merge pull request #33994 from gmcgibbon/rails_g_model_migrations_pathsRafael França2018-09-274-0/+32
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add migrations_paths option to model generatorGannon McGibbon2018-09-274-0/+32
|/ / / /
* | | | Avoid extra touch queries when counter cache is updatedRyuta Kamizono2018-09-272-6/+16
* | | | Refactor counter cache to extract `decrement_counters_before_last_save` on th...Ryuta Kamizono2018-09-272-48/+31
* | | | Merge pull request #34001 from dark-panda/ignore-psqlrc-when-using-psqlRyuta Kamizono2018-09-272-4/+4
|\ \ \ \
| * | | | Use -X when loading structure.sql via psqlJ Smith2018-09-272-4/+4
|/ / / /
* | | | Merge pull request #33997 from MatthiasWinkelmann/pg_dumpRyuta Kamizono2018-09-272-8/+8
|\ \ \ \
| * | | | Removed invalid -X flag for pg_dumpMatthias Winkelmann2018-09-272-8/+8
* | | | | Add ActionCable::Channel::TestCaseVladimir Dementyev2018-09-263-0/+464
|/ / / /
* | | | Merge pull request #33970 from rails/eager-url-helpersAaron Patterson2018-09-2610-36/+102
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |