aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #31727 from eileencodes/refactor-migration-classes-to-allo...Eileen M. Uchitelle2018-01-1819-308/+417
|\
| * Refactor migration to move migrations paths to connectioneileencodes2018-01-1819-308/+417
* | Merge pull request #31713 from aellispierce/refactor-browser-optionsEileen M. Uchitelle2018-01-174-29/+57
|\ \ | |/ |/|
| * Move browser checking to its own classAshley Ellis Pierce2018-01-154-29/+57
* | Merge pull request #31717 from rails/redis-cache-store-encodingGeorge Claghorn2018-01-173-1/+27
|\ \
| * | Convert keys to binary in the Redis cache storeGeorge Claghorn2018-01-171-1/+1
| * | Test against the pure-Ruby Redis driverGeorge Claghorn2018-01-172-0/+26
* | | Merge pull request #31726 from bogdanvlviv/update-layouts_and_rendering-guideEileen M. Uchitelle2018-01-171-1/+1
|\ \ \
| * | | Update "Layouts and Rendering in Rails" guide [ci skip]bogdanvlviv2018-01-171-1/+1
|/ / /
* / / Provide a sensible default hostGeorge Claghorn2018-01-168-13/+15
|/ /
* | Fix constant referenceGeorge Claghorn2018-01-162-3/+2
* | Extract content types from blob dataGeorge Claghorn2018-01-1520-32/+151
* | Merge pull request #27860 from meinac/fix_left_joins_behaviour_with_mergeRyuta Kamizono2018-01-164-1/+37
|\ \
| * | Fix relation merger issue with `left_outer_joins`Mehmet Emin INAC2018-01-154-1/+37
|/ /
* | Don't allow destroyed object mutation after `save` or `save!` is calledRyuta Kamizono2018-01-153-2/+29
* | `create_database` should not add default charset when `collation` is givenRyuta Kamizono2018-01-152-2/+2
* | Merge pull request #28313 from sandrew/masterRyuta Kamizono2018-01-152-2/+15
|\ \
| * | Allow unscoping of left_outer_joinsAndrei Shaidurov2017-03-061-1/+1
* | | Merge pull request #31706 from mrhead/fix-test-case-nameRyuta Kamizono2018-01-141-1/+1
|\ \ \
| * | | Change test case name to FormatValidationTestPatrik Bóna2018-01-141-1/+1
|/ / /
* | | Don't need to pass `manager` to `convert_join_strings_to_ast`Ryuta Kamizono2018-01-141-2/+2
* | | Don't pass garbage args to alias trackerRyuta Kamizono2018-01-142-11/+4
* | | Merge pull request #31572 from kami-zh/fix-templateYuji Yaginuma2018-01-131-2/+3
|\ \ \
| * | | Fix comment about initializers to adapt to the factkami-zh2017-12-271-2/+3
* | | | `deep_dup` is used in `AttributeSet#deep_dup`Ryuta Kamizono2018-01-132-1/+1
* | | | Merge pull request #31651 from eugeneius/use_sha1_digestsSean Griffin2018-01-128-17/+32
|\ \ \ \
| * | | | Use SHA-1 for non-sensitive digests by defaultEugene Kenny2018-01-088-17/+32
* | | | | Merge pull request #31695 from tcopeland/fix_typoRafael França2018-01-121-1/+1
|\ \ \ \ \
| * | | | | Fix doc typo [ci-skip]Tom Copeland2018-01-121-1/+1
|/ / / / /
* | | | | Merge pull request #31675 from Dorian/fix-some-broken-links-in-guidesEileen M. Uchitelle2018-01-124-9/+9
|\ \ \ \ \
| * | | | | Fix some broken links in guidesDorian Marié2018-01-114-9/+9
* | | | | | Use unsafe_inline as the default for script_src CSP until we get a nonce alte...David Heinemeier Hansson2018-01-121-1/+1
* | | | | | Add note about having to restart when modifying initializerDavid Heinemeier Hansson2018-01-121-0/+2
* | | | | | Use complete variable names rather than single-letter abbreviations for styleDavid Heinemeier Hansson2018-01-121-8/+8
* | | | | | Merge pull request #31682 from jameslovejoy/fix-rdoc-typos-documentationMatthew Draper2018-01-125-27/+33
|\ \ \ \ \ \
| * | | | | | Fix typos, update documentationJames Lovejoy2018-01-115-27/+33
|/ / / / / /
* | | | | | Use my fork instead of an thrid-party forkRafael Mendonça França2018-01-112-9/+9
* | | | | | Merge pull request #31671 from larskanis/pg-1.0Rafael Mendonça França2018-01-116-12/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | PostgreSQL: Update Gemfile to pg-1.0.0Lars Kanis2018-01-102-8/+8
| * | | | | PostgreSQL: Allow pg-1.0 gem to be used with ActiveRecordLars Kanis2018-01-104-4/+4
* | | | | | Merge pull request #31653 from ydakuka/fix-typo-0801Eileen M. Uchitelle2018-01-115-5/+5
|\ \ \ \ \ \
| * | | | | | Fix typos [ci skip]Yauheni Dakuka2018-01-115-5/+5
* | | | | | | Instrument image transformationGeorge Claghorn2018-01-101-7/+9
* | | | | | | Instrument preview image drawingGeorge Claghorn2018-01-101-3/+5
* | | | | | | Merge pull request #30268 from ignatiusreza/instrumentationRyuta Kamizono2018-01-114-49/+64
|\ \ \ \ \ \ \
| * | | | | | | add instrumentation for read_multiIgnatius Reza2017-12-294-49/+64
* | | | | | | | Merge pull request #31624 from y-yagi/fix_minitest_511Aaron Patterson2018-01-105-11/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Need to use `klass` to get the class name of the test resultyuuji.yaginuma2018-01-032-6/+6
| * | | | | | | | Correctly get source locationyuuji.yaginuma2018-01-032-1/+7
| * | | | | | | | Use `Minitest::Result` for retain test resultyuuji.yaginuma2018-01-031-2/+4