Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | Merge pull request #33066 from chalofa/alias_child_joins | Ryuta Kamizono | 2018-06-06 | 2 | -2/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Child joins should be aliased when merging relations | Chalo Fernandez | 2018-06-06 | 2 | -2/+27 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #33051 from SamSaffron/master | Matthew Draper | 2018-06-06 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | PERF: avoid allocating column names where possible | Sam | 2018-06-06 | 3 | -3/+3 | |
* | | | | | | | | | | | | | Merge pull request #33029 from fedxgibson/raise_with_duplicate_columns | Eileen M. Uchitelle | 2018-06-04 | 3 | -2/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Migrations will raise an exception if there are multiple column definitions (... | Federico Martinez | 2018-06-01 | 3 | -2/+23 | |
* | | | | | | | | | | | | | | Merge pull request #33047 from artfuldodger/patch-3 | Eileen M. Uchitelle | 2018-06-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix testing guide typo | Jon Evans | 2018-06-01 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #33053 from lazyatom/patch-3 | Ryuta Kamizono | 2018-06-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Correct default value of `unknown_asset_fallback` | James Adam | 2018-06-04 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Initialization block is a part of `build_record` | Ryuta Kamizono | 2018-06-04 | 7 | -14/+22 | |
* | | | | | | | | | | | | | Don't expose `Enumerable#_original_sum_with_required_identity` which is inter... | yuuji.yaginuma | 2018-06-04 | 1 | -1/+5 | |
* | | | | | | | | | | | | | Exclude upload time from instrumented preview time | George Claghorn | 2018-06-03 | 1 | -5/+10 | |
* | | | | | | | | | | | | | Fix `save` in `after_create_commit` won't invoke extra `after_create_commit` | Ryuta Kamizono | 2018-06-04 | 2 | -10/+25 | |
* | | | | | | | | | | | | | Remove unnecessary test | yuuji.yaginuma | 2018-06-03 | 2 | -8/+2 | |
* | | | | | | | | | | | | | `record.destroy` on new record won't invoke after create commit callbacks | Ryuta Kamizono | 2018-06-03 | 2 | -1/+9 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #33039 from ybakos/guides/layouts_and_rendering_class_spel... | Prem Sichanugrist | 2018-06-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Capitalize class name 'Product'. | Yong Bakos | 2018-06-01 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #33018 from kddeisz/defined-attachments | Rafael França | 2018-06-01 | 6 | -24/+147 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Ensure reflection_class_for is private | Kevin Deisz | 2018-05-31 | 2 | -36/+40 | |
| * | | | | | | | | | | | Move ActiveStorage reflection logic entirely into ActiveStorage | Kevin Deisz | 2018-05-31 | 4 | -46/+76 | |
| * | | | | | | | | | | | Reflection for attachments | Kevin Deisz | 2018-05-30 | 4 | -17/+106 | |
* | | | | | | | | | | | | Merge pull request #33040 from ybakos/guides/active_storage_overview_example_... | George Claghorn | 2018-06-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove 'Current.' prefix from example. | Yong Bakos | 2018-06-01 | 1 | -2/+2 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #33028 from yahonda/use_mariadb10_3 | Ryuta Kamizono | 2018-06-01 | 2 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | CI against MariaDB 10.3 | Yasuo Honda | 2018-06-01 | 2 | -2/+4 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #33041 from yahonda/add_changelog_to_bump_sqlite3 | Ryuta Kamizono | 2018-06-01 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | [skip ci] Add changelog about bumping minimum SQLite version to 3.8 | Yasuo Honda | 2018-06-01 | 1 | -0/+4 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #33034 from utilum/remove_mocha_from_action_cable | Rafael França | 2018-05-31 | 11 | -52/+120 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Remove mocha from ActionCable tests | utilum | 2018-05-31 | 1 | -1/+0 | |
| * | | | | | | | | | | Use Ruby instead of mocha | utilum | 2018-05-31 | 3 | -6/+19 | |
| * | | | | | | | | | | Use minitest/mock instead of mocha | utilum | 2018-05-31 | 8 | -45/+101 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #33033 from mikegee/patch-1 | Kasper Timm Hansen | 2018-05-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ci skip] "brethen" is misspelled and unclear | Michael Gee | 2018-05-31 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Remove errant debugger call | George Claghorn | 2018-05-30 | 1 | -1/+0 | |
* | | | | | | | | | | Include blob ID in tempfile name for debugging convenience | George Claghorn | 2018-05-30 | 3 | -10/+20 | |
* | | | | | | | | | | Avoid unused capture in `non_xhr_javascript_response?` | Ryuta Kamizono | 2018-05-31 | 1 | -1/+1 | |
* | | | | | | | | | | ActionMailer::Base can unregister observer(s) and interceptor(s). (#32207) | Kota Miyake | 2018-05-30 | 4 | -19/+135 | |
* | | | | | | | | | | Merge pull request #33020 from joshpencheon/time_zone_frac_microseconds | Rafael França | 2018-05-30 | 2 | -2/+17 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Allow Time.zone.at to receive a second argument | Josh Pencheon | 2018-05-30 | 2 | -2/+17 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Bundle update | Rafael Mendonça França | 2018-05-30 | 1 | -100/+106 | |
* | | | | | | | | | | Merge pull request #32998 from gregmolnar/protect-from-application-javascript | Eileen M. Uchitelle | 2018-05-30 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Include application/javascript when checking content_type | Gabriel Jaldon | 2018-05-27 | 2 | -1/+6 | |
* | | | | | | | | | | | Remove unused `require "active_support/file_update_checker"` | yuuji.yaginuma | 2018-05-30 | 1 | -1/+0 | |
| |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #33012 from bogdanvlviv/fix-discard_on-and-retry_on-doc | Ryuta Kamizono | 2018-05-29 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix name of the second parameter of block executed by `discard_on` and `retry... | bogdanvlviv | 2018-05-29 | 1 | -4/+4 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #32952 from mechanicles/32940-fix | Ryuta Kamizono | 2018-05-29 | 5 | -3/+35 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix parent record should not get saved with duplicate children records | Santosh Wadghule | 2018-05-28 | 5 | -3/+35 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Fix reference | George Claghorn | 2018-05-28 | 1 | -1/+1 | |
* | | | | | | | | | | Verify integrity after chunked download | George Claghorn | 2018-05-28 | 5 | -3/+24 |