aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #32243 from maschwenk/patch-2Guillermo Iguaran2018-03-291-1/+1
|\
| * Raise an error when lockfile diff is generatedMax Schwenk2018-03-131-1/+1
* | Merge pull request #32370 from riseshia/patch-1Andrew White2018-03-291-1/+1
|\ \
| * | Compare ruby version with correct wayShia2018-03-291-1/+1
|/ /
* | Merge pull request #30956 from CJStadler/with-lock-changed-deprecationRafael França2018-03-284-1/+24
* | Bump rack-test to 1.0.0Yuji Yaginuma2018-03-281-1/+1
* | Merge pull request #32299 from davidstosik/expose-fk-ignore-patternGuillermo Iguaran2018-03-277-3/+43
|\ \
| * | Move fk_ignore_pattern from config.active_record to SchemaDumperDavid Stosik2018-03-226-16/+18
| * | Test config.active_record.fk_ignore_patternDavid Stosik2018-03-201-0/+8
| * | Document config.active_record.fk_ignore_patternDavid Stosik2018-03-202-0/+10
| * | Expose foreign key name ignore pattern in configurationDavid Stosik2018-03-197-2/+22
* | | Merge pull request #32317 from dwightwatson/32247George Claghorn2018-03-263-4/+24
|\ \ \
| * | | Flip the order of the after_create callbacksDwight Watson2018-03-273-4/+24
* | | | Merge pull request #32185 from nholden/human_readable_date_time_comparisonsRafael França2018-03-269-0/+63
|\ \ \ \
| * | | | Add `before?` and `after?` methods to date and time classesNick Holden2018-03-069-0/+63
* | | | | Merge pull request #32274 from eileencodes/part-1-add-rake-tasks-for-multi-dbEileen M. Uchitelle2018-03-267-22/+283
|\ \ \ \ \
| * | | | | Refactor configs_for and friendseileencodes2018-03-217-56/+101
| * | | | | Add tests for new rake taskseileencodes2018-03-211-1/+128
| * | | | | Update schema/structure dump tasks for multi dbeileencodes2018-03-212-14/+36
| * | | | | Add ability to create/drop/migrate all dbs for a given enveileencodes2018-03-212-8/+11
| * | | | | Add create/drop/migrate db tasks for each database in the environmenteileencodes2018-03-211-0/+25
| * | | | | Add DatabaseConfig Struct and associated methodseileencodes2018-03-211-0/+39
* | | | | | Merge pull request #32342 from iorme1/masterRichard Schneeman2018-03-251-1/+1
|\ \ \ \ \ \
| * | | | | | Readability fix [ci skip]Isaac Orme2018-03-251-1/+1
|/ / / / / /
* | | | | | Make engine check more explicitAndrew White2018-03-251-6/+9
* | | | | | Remove unused `serialize` methodyuuji.yaginuma2018-03-251-4/+0
* | | | | | Merge pull request #32306 from danhuynhdev/feature/store-accessor-prefixAndrew White2018-03-245-6/+50
|\ \ \ \ \ \
| * | | | | | Add custom prefix to ActiveRecord::Store accessorsTan Huynh2018-03-235-6/+50
* | | | | | | Fix that `touch(:updated_at)` causes multiple assignments on the columnRyuta Kamizono2018-03-232-1/+11
|/ / / / / /
* | | | | | Merge pull request #32315 from huacnlee/fix/local-cache-read-multi-entry-returnRafael França2018-03-222-1/+20
|\ \ \ \ \ \
| * | | | | | Fix Cache `read_multi` with local_cache return values.Jason Lee2018-03-212-1/+20
* | | | | | | Merge pull request #32316 from rails/fix-non-ascii-static-file-servingRafael França2018-03-226-4/+15
|\ \ \ \ \ \ \
| * | | | | | | Use ASCII-8BIT paths in ActionDispatch::StaticAndrew White2018-03-226-4/+15
| | |_|_|/ / / | |/| | | | |
* | | | | | | Remove unused variableRafael Mendonça França2018-03-221-1/+0
* | | | | | | Merge pull request #32319 from yahonda/no_monkeypatch_for_ruby260Rafael França2018-03-221-9/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Ruby 2.6 will not require monkey patched `URI#unescape`Yasuo Honda2018-03-221-9/+1
|/ / / / / /
* | | | | | Merge pull request #31869 from BKSpurgeon/patch-1Ryuta Kamizono2018-03-221-12/+16
|\ \ \ \ \ \
| * | | | | | Update documentation [ci skip]Ben Koshy2018-02-021-12/+15
* | | | | | | Use try in tests that try to test try.Kasper Timm Hansen2018-03-211-7/+2
* | | | | | | Fix `test_config_another_database` failureRyuta Kamizono2018-03-222-5/+5
* | | | | | | Add `QueryingMethodsDelegationTest` to cover query methods delegationRyuta Kamizono2018-03-221-0/+28
* | | | | | | Merge pull request #32221 from composerinteralia/batch-predicate-builderRyuta Kamizono2018-03-221-10/+16
|\ \ \ \ \ \ \
| * | | | | | | Use PredicateBuilder for bind params in BatchesDaniel Colson2018-03-111-10/+16
* | | | | | | | Merge pull request #32253 from zwass/before_action_docsRyuta Kamizono2018-03-221-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Add cancellation info to before filter docsZachary Wasserman2018-03-141-0/+12
* | | | | | | | | Merge pull request #32310 from sodabrew/mysql2-0.4-0.5Ryuta Kamizono2018-03-222-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Support mysql2 0.4.x and 0.5.xAaron Stone2018-03-202-2/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Update loofah to mitigate CVE-2018-8048Andrew White2018-03-211-5/+5
* | | | | | | | Merge pull request #32293 from dzirtusss/fix-system-tests-transactionsEileen M. Uchitelle2018-03-211-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix system tests transactions not closed between examplesSergey Tarasov2018-03-191-0/+1