aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
|\
| * Add situation for belongs to association. [ci skip]lanzhiheng2018-07-181-1/+1
* | Merge pull request #33363 from ahorek/transaction_bugRafael França2018-07-182-5/+38
|\ \
| * | use set_server_option if possiblepavel2018-07-152-5/+38
* | | Revert "Merge pull request #33385 from lanzhiheng/add-example-for-has-and-bel...Rafael Mendonça França2018-07-181-16/+0
* | | Merge pull request #31320 from gtqnchev/to_form_params-fixRafael França2018-07-183-3/+21
|\ \ \
| * | | Fix issue with `button_to`'s `to_form_params`Georgi Georgiev2018-07-163-3/+21
* | | | Merge pull request #33385 from lanzhiheng/add-example-for-has-and-belongs-to-...Rafael França2018-07-181-0/+16
|\ \ \ \
| * | | | Add example for `has-and-belongs-to-many` association. [ci skip]lanzhiheng2018-07-181-0/+16
| | |_|/ | |/| |
* | | | Merge pull request #33358 from azbshiri/summer-timeRafael França2018-07-182-2/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Test DST both in local and utc timezoneAlireza Bashiri2018-07-171-2/+24
| * | | Implement change() to convert to "2001-01-01" firstSean Prashad2018-07-171-0/+1
* | | | Merge pull request #33375 from utilum/stub_leftoverRafael França2018-07-173-26/+46
|\ \ \ \
| * | | | Replace some more Mocha#stub calls with Minitestutilum2018-07-173-25/+46
| * | | | Remove unnecessary Mocha stubutilum2018-07-171-1/+0
| |/ / /
* | | | Remove unnecessary tapGeorge Claghorn2018-07-171-10/+8
* | | | Fix replacing many attachments via assign and attachGeorge Claghorn2018-07-172-0/+40
|/ / /
* | | Correct test nameGeorge Claghorn2018-07-161-1/+1
* | | Fix that successive ActiveStorage::Attached::Many#attach calls would overwrit...George Claghorn2018-07-162-27/+22
* | | Test removing attachments via #attachGeorge Claghorn2018-07-162-12/+59
* | | Merge pull request #33370 from bogdanvlviv/follow-up-33337Ryuta Kamizono2018-07-163-15/+11
|\ \ \ | |/ / |/| |
| * | Clarify test casesbogdanvlviv2018-07-153-15/+11
* | | Merge pull request #33364 from lanzhiheng/fix-document-in-model-validatorRyuta Kamizono2018-07-161-18/+0
|\ \ \
| * | | Remove the invalid usage document about `errors`. [ci skip]lanzhiheng2018-07-161-18/+0
* | | | Restore inadvertently-removed fallbackGeorge Claghorn2018-07-152-1/+8
* | | | Support HTTP Range downloads from diskGeorge Claghorn2018-07-153-20/+30
* | | | Merge pull request #33337 from utilum/stub_with_minitest_not_mochaRyuta Kamizono2018-07-166-461/+699
|\ \ \ \ | | |/ / | |/| |
| * | | Stub with Minitest instead of Mochautilum2018-07-156-461/+699
| | |/ | |/|
* | | Merge pull request #33366 from ahorek/fix_selectorRyuta Kamizono2018-07-161-1/+7
|\ \ \
| * | | test_should_impose_childless_html_tags_in_html failure with JRubypavel2018-07-151-1/+7
| |/ /
* | | Merge pull request #33365 from lanzhiheng/fix-document-issue-about-active-rec...Ryuta Kamizono2018-07-161-4/+4
|\ \ \ | |/ / |/| |
| * | Fix document issue in active record callback about `after_touch` hook.lanzhiheng2018-07-151-4/+4
|/ /
* | Merge pull request #33361 from jhubert/bugfix/fix-added-string-attributesEileen M. Uchitelle2018-07-142-1/+7
|\ \
| * | Ensure attribute is a symbol in the added? methodJeremy Baker2018-07-142-1/+7
* | | Merge pull request #33360 from jedrekdomanski/Update-active-record-querying-r...Eileen M. Uchitelle2018-07-141-0/+6
|\ \ \ | |/ / |/| |