Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge branch 'master' into eager-url-helpers | Aaron Patterson | 2018-09-26 | 76 | -174/+276 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #30676 from artofhuman/import-assert-attrs-error-message | Rafael França | 2018-09-26 | 2 | -2/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Improve error message when assign wrong attributes to model | Semyon Pupkov | 2018-04-28 | 2 | -2/+4 | |
* | | | | | | | | | Merge pull request #33983 from gmcgibbon/raise_if_fixture_path_blank | Rafael França | 2018-09-26 | 3 | -0/+21 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Raise an error when loading all fixtures from nil fixture_path | Gannon McGibbon | 2018-09-26 | 3 | -0/+21 | |
* | | | | | | | | | | Merge pull request #31819 from bpohoriletz/master | Eileen M. Uchitelle | 2018-09-26 | 2 | -4/+29 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | If association is a hash-like object preloading fails | Bohdan Pohorilets | 2018-09-26 | 2 | -4/+29 | |
* | | | | | | | | | | | Remove force parent loading when counter cache child is created/destroyed | Ryuta Kamizono | 2018-09-26 | 2 | -7/+7 | |
| |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Revert "Remove `counter_cache_target` which is no longer called" | Ryuta Kamizono | 2018-09-26 | 2 | -2/+11 | |
* | | | | | | | | | | Update counter cache in memory if parent target is existed | Ryuta Kamizono | 2018-09-26 | 2 | -10/+35 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #33987 from yahonda/specify_database_characterset_at_travis | Ryuta Kamizono | 2018-09-26 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Use the same option for create database statements between Raketask and travi... | Yasuo Honda | 2018-09-26 | 1 | -4/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Fix "warning: shadowing outer local variable - config" | yuuji.yaginuma | 2018-09-26 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #33968 from gmcgibbon/stringify_db_configurations | Rafael França | 2018-09-25 | 3 | -2/+30 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Stringify database configurations | Gannon McGibbon | 2018-09-24 | 3 | -2/+30 | |
* | | | | | | | | | Merge pull request #33975 from JuanitoFatas/jf.fix-test-name | Rafael França | 2018-09-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix a content_for test description | Juanito Fatas | 2018-09-25 | 1 | -1/+1 | |
* | | | | | | | | | | Remove `counter_cache_target` which is no longer called | Ryuta Kamizono | 2018-09-26 | 1 | -10/+1 | |
* | | | | | | | | | | Fix more offences | Rafael Mendonça França | 2018-09-25 | 3 | -3/+3 | |
* | | | | | | | | | | Change the empty block style to have space inside of the block | Rafael Mendonça França | 2018-09-25 | 60 | -141/+142 | |
| | | | * | | | | | | Routes from Engine Railties should not be an infinite loop | Aaron Patterson | 2018-09-26 | 2 | -2/+10 | |
| | | | * | | | | | | Eager load supports individual files | Aaron Patterson | 2018-09-26 | 2 | -4/+8 | |
| | | | * | | | | | | Allow helpers to be deferred until the routes have been finalized | Aaron Patterson | 2018-09-25 | 2 | -5/+24 | |
| | | | * | | | | | | Eagerly build the routing helper module after routes are committed | Aaron Patterson | 2018-09-25 | 7 | -27/+62 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #33974 from rails/remove-catch-all-from-am | Aaron Patterson | 2018-09-25 | 1 | -17/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | This patch removes deprecated catch-all routes from AM | Aaron Patterson | 2018-09-24 | 1 | -17/+7 | |
* | | | | | | | | | | Merge pull request #33973 from rails/remove-catch-all | Aaron Patterson | 2018-09-25 | 19 | -78/+296 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | make bot happy | Aaron Patterson | 2018-09-24 | 4 | -9/+9 | |
| * | | | | | | | | | | Add hack to deal with warnings | Aaron Patterson | 2018-09-24 | 1 | -1/+1 | |
| * | | | | | | | | | | Remove deprecated catch-all route in the AV tests | Aaron Patterson | 2018-09-24 | 19 | -78/+296 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #33977 from marshall-lee/abandon-top-support | Ryuta Kamizono | 2018-09-25 | 10 | -27/+4 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Abandon TOP support. | Vladimir Kochnev | 2018-09-25 | 10 | -27/+4 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #33953 from wagurano/guides_markdown_custom_header_id | Rafael França | 2018-09-24 | 2 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix rails guides markdown.rb and renderer.rb to use custom header id | wagurano | 2018-09-23 | 2 | -2/+7 | |
* | | | | | | | | | | Merge pull request #33964 from pskl/master | Rafael França | 2018-09-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Improve phrasing of one sentence in the contributing guide | Pascal Lamouric | 2018-09-24 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #33959 from eugeneius/eager_load_attribute_methods | Ryuta Kamizono | 2018-09-25 | 2 | -0/+55 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Eagerly define attribute methods in production | Eugene Kenny | 2018-09-24 | 2 | -0/+55 | |
* | | | | | | | | | | Merge pull request #33960 from utilum/update_minimagick_version_to_4.9.2 | Ryuta Kamizono | 2018-09-24 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | update mini_magick to the latest version | utilum | 2018-09-24 | 1 | -2/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Extract `instrument` method. | Kasper Timm Hansen | 2018-09-23 | 1 | -26/+11 | |
* | | | | | | | | | `Persistence#increment!` requires an attribute argument which is incremented | Ryuta Kamizono | 2018-09-24 | 2 | -1/+6 | |
* | | | | | | | | | Merge pull request #33829 from mtsmfm/encode-filename | Kasper Timm Hansen | 2018-09-23 | 10 | -82/+104 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Encode Content-Disposition filenames on send_data and send_file | Fumiaki MATSUSHIMA | 2018-09-13 | 10 | -82/+104 | |
* | | | | | | | | | | Merge pull request #33949 from sjain1107/no-private-def | Kasper Timm Hansen | 2018-09-23 | 9 | -72/+87 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove private def | Sakshi Jain | 2018-09-23 | 9 | -72/+87 | |
* | | | | | | | | | | | Merge pull request #33951 from abartov/patch-1 | George Claghorn | 2018-09-23 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Added mandatory region and bucket | Asaf Bartov | 2018-09-23 | 1 | -0/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #32971 from y-yagi/use_plus_operator_to_unfreeze_string | Yuji Yaginuma | 2018-09-23 | 101 | -364/+366 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Enable `Performance/UnfreezeString` cop | yuuji.yaginuma | 2018-09-23 | 101 | -364/+366 | |
|/ / / / / / / / / |