aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Use consistent hash syntax in AR docsOrhan Toy2018-07-221-8/+8
* Add implicit to path conversion to uploaded file (#28676)Aaron Kromer2018-07-223-0/+21
* Merge pull request #33403 from bogdanvlviv/clarify-test_notes_finds_notes_in_...Kasper Timm Hansen2018-07-221-59/+58
|\
| * Clarify `railties/test/application/rake/notes_test.rb`bogdanvlviv2018-07-211-59/+58
* | Merge pull request #33409 from utilum/correct_epxectations_to_meet_minitest_s...Kasper Timm Hansen2018-07-224-49/+112
|\ \
| * | Replace permissive Mocha expectationsutilum2018-07-222-32/+86
| * | Replace Mocha#stubs with assert_called_withutilum2018-07-221-6/+11
| * | Fix Mocha replacement that slipped out of #33337utilum2018-07-221-11/+15
|/ /
* | Merge pull request #32984 from chiraggshah/min-thread-env-variableRichard Schneeman2018-07-211-2/+3
|\ \
| * | Modified the changes to make it backward compatibleChirag Shah2018-07-211-1/+1
| * | Separate min and max threads count for pumaChirag Shah2018-05-251-2/+3
* | | Merge pull request #33268 from benpickles/remove-pubdate-from-docsRichard Schneeman2018-07-211-2/+0
|\ \ \
| * | | Keep time_tag docs up-to-date.Ben Pickles2018-07-011-2/+0
* | | | Remove unused attributeGeorge Claghorn2018-07-212-5/+5
* | | | Merge pull request #33411 from bogdanvlviv/follow-up-33401-5491f8115711Kasper Timm Hansen2018-07-211-4/+3
|\ \ \ \
| * | | | Clarify example of the test `ActionController::HttpAuthentication::Token` [ci...bogdanvlviv2018-07-211-4/+3
|/ / / /
* | | | Merge pull request #24131 from brchristian/limit_and_primary_keyRichard Schneeman2018-07-213-1/+22
|\ \ \ \ | |_|_|/ |/| | |
| * | | CHANGELOG entryBrian Christian2018-07-191-0/+6
| * | | don't impose primary key order if limit() is definedBrian Christian2018-07-191-1/+1
| * | | tests for use of primary_key with limitBrian Christian2018-07-191-0/+15
* | | | Merge pull request #33408 from ycherniavskyi/fix_leaking_special_form_with_at...Kasper Timm Hansen2018-07-214-7/+25
|\ \ \ \
| * | | | Fix leaking special form_with attributes into html attributesYurii Cherniavskyi2018-07-204-7/+25
* | | | | Merge pull request #33405 from georgeclaghorn/activestorage-referential-integ...George Claghorn2018-07-208-6/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Discard ActiveStorage::PurgeJobs on ActiveRecord::InvalidForeignKeyGeorge Claghorn2018-07-202-1/+11
| * | | | Test that ActiveStorage::Blob#purge fails when attachments existGeorge Claghorn2018-07-201-0/+8
| * | | | Add a foreign-key constraint to the attachments table for blobsGeorge Claghorn2018-07-193-2/+3
| * | | | Delete attachment before purging blobGeorge Claghorn2018-07-191-2/+2
| * | | | Destroy blob record before deleting stored dataGeorge Claghorn2018-07-191-1/+1
* | | | | [ci skip] Fixup changelog. Trim title. Mention benefit.Kasper Timm Hansen2018-07-202-5/+8
* | | | | Merge pull request #33171 from zvkemp/active-job-asn-wrap-enqueueKasper Timm Hansen2018-07-203-6/+27
|\ \ \ \ \
| * | | | | Wrap ActiveJob::Enqueue in evented ActiveSupport::Notificationzvkemp2018-07-173-6/+27
* | | | | | Merge pull request #32410 from yuki24/show-cause-on-debug-view-2Kasper Timm Hansen2018-07-2011-77/+189
|\ \ \ \ \ \
| * | | | | | Show nested exceptions on the debug viewYuki Nishijima2018-07-1511-77/+189
* | | | | | | [ci skip] Fix syntax error + make example easier to follow.Kasper Timm Hansen2018-07-201-2/+3
* | | | | | | [ci skip] Strike changelog entry, since it's 5.2 backported.Kasper Timm Hansen2018-07-201-11/+0
* | | | | | | [ci skip] Move changelog entry up top. Clarify.Kasper Timm Hansen2018-07-201-7/+11
* | | | | | | Merge pull request #33392 from azbshiri/actionpack/prevent-request-encoder-to...Kasper Timm Hansen2018-07-203-1/+22
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Prevent `RequestEncoder#encode_params` to parse falsey paramsAlireza Bashiri2018-07-203-1/+22
| | |_|/ / / | |/| | | |
* | | | | | Fix deprecation message for `SOURCE_ANNOTATION_DIRECTORIES`yuuji.yaginuma2018-07-202-1/+4
* | | | | | Merge pull request #33401 from pinewong/patch-1Rafael França2018-07-201-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix basic auth problem in ActionController::HttpAuthentication::Basic doc黄松2018-07-201-2/+2
|/ / / / /
* | | | | Merge pull request #33394 from kamipo/avoid_extra_scopingEileen M. Uchitelle2018-07-193-2/+8
|\ \ \ \ \
| * | | | | Avoid extra scoping in delegating to klass methods in the `scope` blockRyuta Kamizono2018-07-193-2/+8
* | | | | | Merge pull request #33391 from utilum/method_call_assertions_instead_of_mochaRyuta Kamizono2018-07-195-98/+154
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use MethodCallAssertions instead of Mocha#expectsutilum2018-07-195-98/+154
* | | | | | Fix `insert_fixtures_set` to be restored original connection flagsRyuta Kamizono2018-07-193-34/+116
* | | | | | Link between ActiveStorage::Blob#purge, #purge_later, and #delete [ci skip]George Claghorn2018-07-181-5/+5
* | | | | | Clarify the ActiveStorage::Attachment#purge and #purge_later docsGeorge Claghorn2018-07-181-2/+2
|/ / / / /
* | | | | Revert "Short circuit the scoping delegation for `relation.all`"Ryuta Kamizono2018-07-191-1/+0
* | | | | Merge pull request #33384 from lanzhiheng/add-situation-for-belongs-to-associ...Rafael França2018-07-181-1/+1
|\ \ \ \ \