aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsJonathan Boler2018-06-0425-68/+231
|\
| * Merge pull request #33053 from lazyatom/patch-3Ryuta Kamizono2018-06-051-1/+1
| |\
| | * Correct default value of `unknown_asset_fallback`James Adam2018-06-041-1/+1
| |/
| * Initialization block is a part of `build_record`Ryuta Kamizono2018-06-047-14/+22
| * Don't expose `Enumerable#_original_sum_with_required_identity` which is inter...yuuji.yaginuma2018-06-041-1/+5
| * Exclude upload time from instrumented preview timeGeorge Claghorn2018-06-031-5/+10
| * Fix `save` in `after_create_commit` won't invoke extra `after_create_commit`Ryuta Kamizono2018-06-042-10/+25
| * Remove unnecessary testyuuji.yaginuma2018-06-032-8/+2
| * `record.destroy` on new record won't invoke after create commit callbacksRyuta Kamizono2018-06-032-1/+9
| * Merge pull request #33039 from ybakos/guides/layouts_and_rendering_class_spel...Prem Sichanugrist2018-06-021-1/+1
| |\
| | * Capitalize class name 'Product'.Yong Bakos2018-06-011-1/+1
| * | Merge pull request #33018 from kddeisz/defined-attachmentsRafael França2018-06-016-24/+147
| |\ \
| | * | Ensure reflection_class_for is privateKevin Deisz2018-05-312-36/+40
| | * | Move ActiveStorage reflection logic entirely into ActiveStorageKevin Deisz2018-05-314-46/+76
| | * | Reflection for attachmentsKevin Deisz2018-05-304-17/+106
| * | | Merge pull request #33040 from ybakos/guides/active_storage_overview_example_...George Claghorn2018-06-011-2/+2
| |\ \ \
| | * | | Remove 'Current.' prefix from example.Yong Bakos2018-06-011-2/+2
| | | |/ | | |/|
| * | | Merge pull request #33028 from yahonda/use_mariadb10_3Ryuta Kamizono2018-06-012-2/+4
| |\ \ \
| | * | | CI against MariaDB 10.3Yasuo Honda2018-06-012-2/+4
| | | |/ | | |/|
| * | | Merge pull request #33041 from yahonda/add_changelog_to_bump_sqlite3Ryuta Kamizono2018-06-011-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | [skip ci] Add changelog about bumping minimum SQLite version to 3.8Yasuo Honda2018-06-011-0/+4
| |/ /
* | | Eager load routes on rebuildJonathan Boler2018-06-041-14/+2
* | | Only build routes simulator when there is an ASTJonathan Boler2018-06-041-0/+1
|/ /
* | Merge pull request #33034 from utilum/remove_mocha_from_action_cableRafael França2018-05-3111-52/+120
|\ \
| * | Remove mocha from ActionCable testsutilum2018-05-311-1/+0
| * | Use Ruby instead of mochautilum2018-05-313-6/+19
| * | Use minitest/mock instead of mochautilum2018-05-318-45/+101
|/ /
* | Merge pull request #33033 from mikegee/patch-1Kasper Timm Hansen2018-05-311-1/+1
|\ \
| * | [ci skip] "brethen" is misspelled and unclearMichael Gee2018-05-311-1/+1
|/ /
* | Remove errant debugger callGeorge Claghorn2018-05-301-1/+0
* | Include blob ID in tempfile name for debugging convenienceGeorge Claghorn2018-05-303-10/+20
* | Avoid unused capture in `non_xhr_javascript_response?`Ryuta Kamizono2018-05-311-1/+1
* | ActionMailer::Base can unregister observer(s) and interceptor(s). (#32207)Kota Miyake2018-05-304-19/+135
* | Merge pull request #33020 from joshpencheon/time_zone_frac_microsecondsRafael França2018-05-302-2/+17
|\ \
| * | Allow Time.zone.at to receive a second argumentJosh Pencheon2018-05-302-2/+17
| |/
* | Bundle updateRafael Mendonça França2018-05-301-100/+106
* | Merge pull request #32998 from gregmolnar/protect-from-application-javascriptEileen M. Uchitelle2018-05-302-1/+6
|\ \
| * | Include application/javascript when checking content_typeGabriel Jaldon2018-05-272-1/+6
* | | Remove unused `require "active_support/file_update_checker"`yuuji.yaginuma2018-05-301-1/+0
| |/ |/|
* | Merge pull request #33012 from bogdanvlviv/fix-discard_on-and-retry_on-docRyuta Kamizono2018-05-291-4/+4
|\ \
| * | Fix name of the second parameter of block executed by `discard_on` and `retry...bogdanvlviv2018-05-291-4/+4
|/ /
* | Merge pull request #32952 from mechanicles/32940-fixRyuta Kamizono2018-05-295-3/+35
|\ \
| * | Fix parent record should not get saved with duplicate children recordsSantosh Wadghule2018-05-285-3/+35
* | | Fix referenceGeorge Claghorn2018-05-281-1/+1
* | | Verify integrity after chunked downloadGeorge Claghorn2018-05-285-3/+24
* | | Ensure casting by boolean attribute when queryingRyuta Kamizono2018-05-293-43/+47
* | | Merge pull request #33005 from mechanicles/fix-sentenceRafael França2018-05-281-1/+1
|\ \ \
| * | | Fix sentence [ci skip]Santosh Wadghule2018-05-281-1/+1
* | | | Hide Active Storage migration installation task (#33007)utilum2018-05-281-0/+3
* | | | Merge pull request #33003 from bogdanvlviv/fix-actioncable-test-changed-in-32727Ryuta Kamizono2018-05-281-1/+1
|\ \ \ \