aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Testing Guide: unnecessary commentutilum2018-07-251-1/+1
* Merge pull request #33432 from damireh/patch-1George Claghorn2018-07-251-1/+1
|\
| * Update with_options.rbDaniel Amireh2018-07-251-1/+1
|/
* Normalize time value not to be affected by summer timeRyuta Kamizono2018-07-253-10/+41
* Merge pull request #33229 from albertoalmagro/albertoalmagro/prefer-rails-com...Matthew Draper2018-07-2546-304/+301
|\
| * Substitute references to task for commandAlberto Almagro2018-07-067-26/+26
| * Show rails instead of bin/rails on USAGE instructionsAlberto Almagro2018-07-066-11/+11
| * Improve text readabilityAlberto Almagro2018-07-061-1/+1
| * Homogenize rails commands and former rake tasksAlberto Almagro2018-07-061-58/+53
| * Fix typo 'in via'Alberto Almagro2018-07-061-1/+1
| * Recommend use of rails over bin/railsAlberto Almagro2018-07-0641-222/+224
* | Merge pull request #33426 from pwim/https-guide-linksEileen M. Uchitelle2018-07-2479-111/+111
|\ \
| * | Rails guides are now served over httpsPaul McMahon2018-07-2479-111/+111
|/ /
* | Merge pull request #33371 from lanzhiheng/change-the-text-color-which-wrapped...Eileen M. Uchitelle2018-07-231-1/+10
|\ \
| * | Change the background color which wrapped by code tag. [ci skip]lanzhiheng2018-07-191-1/+10
* | | Merge pull request #30919 from seanlinsley/17622-before_save_strict_argumentsRyuta Kamizono2018-07-232-7/+36
|\ \ \
| * | | add strict argument checking to ActiveRecord callbacksSean Linsley2018-07-222-7/+32
|/ / /
* | | Merge pull request #33415 from orhantoy/feature/docs-consistent-hash-syntaxGeorge Claghorn2018-07-221-8/+8
|\ \ \
| * | | [ci skip] Use consistent hash syntax in AR docsOrhan Toy2018-07-221-8/+8
* | | | Merge pull request #33416 from krmannix/masterGeorge Claghorn2018-07-221-1/+1
|\ \ \ \
| * | | | [ci skip] fix typo in Associations guideK. Rodman Mannix2018-07-221-1/+1
| |/ / /
* | | | Merge pull request #33417 from orhantoy/feature/tidy-up-add_index-examplesGeorge Claghorn2018-07-221-12/+3
|\ \ \ \
| * | | | [ci skip] Tidy up formatting of examplesOrhan Toy2018-07-221-12/+3
| |/ / /
* | | | Merge pull request #33418 from azbshiri/document-rendererRichard Schneeman2018-07-221-0/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Add render options in action_controller/renderer for api documentation [ci skip]Alireza Bashiri2018-07-221-0/+15
|/ / /
* | | 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