aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Only run isolated tests on the latest stable ruby: that's now 2.5Matthew Draper2018-01-251-1/+1
* Merge pull request #31784 from composerinteralia/relation-signatureRafael França2018-01-2414-38/+66
|\
| * Avoid passing unnecessary arguments to relationDaniel Colson2018-01-2414-38/+66
* | Skip test that use fork in the memory store dbRafael Mendonça França2018-01-241-32/+34
* | Merge pull request #31690 from olivierlacan/no-verbose-query-logs-in-consoleRafael França2018-01-241-0/+1
|\ \
| * | Disable verbose_query_logs in Rails ConsoleOlivier Lacan2018-01-231-0/+1
* | | Merge pull request #31642 from fatkodima/metal-action-duplicationRafael França2018-01-241-10/+8
|\ \ \ | |_|/ |/| |
| * | Remove code duplication for `ActionController::Metal.action`fatkodima2018-01-221-10/+8
* | | Make discard safe when it follows a manual disconnectMatthew Draper2018-01-252-1/+41
* | | Merge pull request #31773 from dinahshi/postgresql_bulk_patchMatthew Draper2018-01-242-3/+4
|\ \ \
| * | | Use concat to join procs arrays in bulk_change_tableDinah Shi2018-01-232-3/+4
* | | | Merge pull request #31422 from Edouard-chin/multistatement-fixturesMatthew Draper2018-01-246-56/+260
|\ \ \ \
| * | | | Allow a 2 bytes margin:Edouard CHIN2018-01-232-4/+7
| * | | | Combine delete and insert statements in the same queryEdouard CHIN2018-01-222-13/+10
| * | | | Build a multi-statement query when inserting fixtures:Edouard CHIN2018-01-226-56/+260
* | | | | Fix CHANGELOG format [ci skip]Ryuta Kamizono2018-01-241-4/+5
* | | | | tweaks for #31704 [ci skip]Ryuta Kamizono2018-01-241-2/+2
* | | | | Clarification for noobs. (#31704)loothunter12018-01-232-4/+8
* | | | | Merge pull request #30622 from aidanharan/custom-discarded-job-handlingRafael França2018-01-234-1/+36
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into custom-discarded-job-handlingAidan Haran2017-12-091020-6684/+15161
| |\ \ \ \ \
| * | | | | | Allow for custom handling of exceptions that are discardedAidan Haran2017-09-164-1/+36
* | | | | | | Allow attributes with a proc default to be marshalledSean Griffin2018-01-233-0/+38
* | | | | | | Merge pull request #30391 from jbourassa/fix-actionmailer-lambda-defaultRyuta Kamizono2018-01-244-2/+34
|\ \ \ \ \ \ \
| * | | | | | | Fix AM::Base.default proc arity breaking changeJimmy Bourassa2017-08-294-2/+33
* | | | | | | | Merge pull request #31750 from morygonzalez/consider-locale_selector-missingYuji Yaginuma2018-01-231-5/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix locale_selector JS bug in ActionMailer PreviewHitoshi Nakashima2018-01-231-5/+16
* | | | | | | | | Merge pull request #31487 from fatkodima/improve_cache_fault_toleranceRafael França2018-01-225-10/+137
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve fault tolerance for redis cache storefatkodima2018-01-235-10/+137
|/ / / / / / / / /
* | | | | | | | | Add missing requireGeorge Claghorn2018-01-221-3/+5
* | | | | | | | | Merge pull request #31765 from utilum/langRafael França2018-01-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove text repetitionutilum2018-01-221-1/+1
* | | | | | | | | | Merge pull request #31447 from fatkodima/redis_cache-connection_poolRafael Mendonça França2018-01-229-74/+167
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add support for connection pooling on RedisCacheStorefatkodima2018-01-229-74/+167
* | | | | | | | | | Merge pull request #31763 from utilum/image_not_truncatedRafael França2018-01-221-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update guide text not to contradict imageutilum2018-01-221-2/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #31549 from fatkodima/foreign_tablesRyuta Kamizono2018-01-234-1/+128
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Support for PostgreSQL foreign tablesfatkodima2018-01-224-1/+128
| |/ / / / / / / / /
* / / / / / / / / / Fix building has_one through recordRyuta Kamizono2018-01-234-14/+22
|/ / / / / / / / /
* | | | | | | | | Merge pull request #30535 from leonelgalan/becomes_and_default_inheritanceRyuta Kamizono2018-01-232-1/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ignores a default subclass when `becomes(Parent)`Leonel Galan2018-01-222-1/+18
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24964 from vipulnsward/true-falseMatthew Draper2018-01-231-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Dont perform unnecessary check with false, just use true/false values for @ac...Vipul A M2016-05-111-2/+2
* | | | | | | | | Merge pull request #31710 from eugeneius/indestructible_through_recordRyuta Kamizono2018-01-226-5/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't update counter cache when through record was not destroyedEugene Kenny2018-01-146-5/+24
* | | | | | | | | | Pass desired driver to Redis client constructor rather than munging global co...George Claghorn2018-01-211-16/+12
* | | | | | | | | | Merge pull request #31753 from justjake/patch-1George Claghorn2018-01-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | bin/yarn: Pass through arguments with spacesJake Teton-Landis2018-01-211-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #31757 from composerinteralia/define-attributeRyuta Kamizono2018-01-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use singular define_attribute_methodDaniel Colson2018-01-211-1/+1
|/ / / / / / / / / /
* / / / / / / / / / PERF: Recover `changes_applied` performance (#31698)Ryuta Kamizono2018-01-224-75/+45
|/ / / / / / / / /