aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove upper bound on Capybaraeileencodes2018-04-104-4/+4
* Merge pull request #32517 from javan/ast/no-root-in-jsonJavan Makhmali2018-04-102-1/+24
|\
| * Always exclude JSON root from direct_uploads#create responseJavan Makhmali2018-04-102-1/+24
|/
* 4.2 is still maintainedRafael Mendonça França2018-04-101-1/+1
* Merge pull request #32498 from eugeneius/mutation_tracker_merge_changesRyuta Kamizono2018-04-102-1/+9
|\
| * Prevent changes_to_save from mutating attributesEugene Kenny2018-04-082-1/+9
* | Merge pull request #32515 from bogdanvlviv/add-test_request_format_kwarg_does...Ryuta Kamizono2018-04-101-0/+8
|\ \
| * | Add `TestCaseTest#test_request_format_kwarg_doesnt_mutate_params` to masterbogdanvlviv2018-04-101-0/+8
* | | Merge pull request #32508 from radar/radar/maintenance-policyRyuta Kamizono2018-04-101-3/+3
|\ \ \
| * | | Correct Maintenance Policy for Rails 5.2Ryan Bigg2018-04-101-3/+3
| |/ /
* | | Merge pull request #32509 from bogdanvlviv/update-bug_report_templates-on-masterRyuta Kamizono2018-04-105-5/+5
|\ \ \ | |/ / |/| |
| * | Update bug report templatesbogdanvlviv2018-04-105-5/+5
|/ /
* | Merge pull request #32488 from swrobel/patch-4Rafael Mendonça França2018-04-091-1/+1
|\ \
| * | Only disable headless chrome gpu on WindowsStefan Wrobel2018-04-071-1/+1
* | | Don't create namespaced tasks if single db applicationeileencodes2018-04-091-2/+7
* | | Add multidb application testeileencodes2018-04-092-16/+215
* | | Allow schema/structure load for multiple databaseseileencodes2018-04-091-3/+3
* | | Merge pull request #32502 from mrhead/improve-error-messageEileen M. Uchitelle2018-04-091-1/+1
|\ \ \
| * | | Improve the null origin error messagePatrik Bóna2018-04-091-1/+1
|/ / /
* | | Merge pull request #32497 from eugeneius/mutation_tracker_changed_attribute_n...Ryuta Kamizono2018-04-092-1/+9
|\ \ \ | |_|/ |/| |
| * | Avoid generating full changes hash on every saveEugene Kenny2018-04-082-1/+9
|/ /
* | Merge pull request #32494 from dixpac/as_fix_outdated_documentation_for_variantsRyuta Kamizono2018-04-082-4/+4
|\ \
| * | Fix leftover references to VariantsController [ci skip]dixpac2018-04-082-4/+4
* | | Merge pull request #32486 from floehopper/mocha-updatesGuillermo Iguaran2018-04-074-6/+4
|\ \ \
| * | | Upgrade Mocha from v1.3.0 to v1.5.0James Mead2018-04-071-1/+1
| * | | Make Mocha setup explcitly Minitest-specificJames Mead2018-04-072-2/+2
| * | | Simplify declaration of mocha dependency in GemfileJames Mead2018-04-071-3/+1
* | | | Fix test class name for `Assertions` moduleyuuji.yaginuma2018-04-081-1/+1
* | | | Merge pull request #32491 from yhirano55/enable_verbose_in_activestorageRyuta Kamizono2018-04-081-0/+1
|\ \ \ \
| * | | | Enable verbose option in ActiveStorageYoshiyuki Hirano2018-04-081-0/+1
|/ / / /
* | | | Merge pull request #32489 from yhirano55/update_railties_rdoc_mainXavier Noria2018-04-071-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | rewords a bit RDOC_MAIN.rdoc [ci skip]Yoshiyuki Hirano2018-04-081-2/+2
|/ / /
* | / rewords a bit README.md [ci skip]Xavier Noria2018-04-071-4/+4
| |/ |/|
* | Merge pull request #32487 from yhirano55/update_releasing_railsRyuta Kamizono2018-04-071-2/+2
|\ \ | |/ |/|
| * Update URLs in RELEASING_RAILS.md [ci skip]Yoshiyuki Hirano2018-04-071-2/+2
|/
* Merge pull request #32485 from bogdanvlviv/fix-actionview/CHANGELOG.mdRyuta Kamizono2018-04-071-2/+2
|\
| * Fix `actionview/CHANGELOG.md`bogdanvlviv2018-04-071-2/+2
|/
* Merge pull request #32482 from yhirano55/remove_record_tag_helperAndrew White2018-04-074-58/+4
|\
| * Remove RecordTagHelperYoshiyuki Hirano2018-04-074-58/+4
* | Merge pull request #32350 from rails/use-current-model-for-as-url-hostAndrew White2018-04-076-6/+26
|\ \
| * | Use a current model to provide the host for service urlsAndrew White2018-04-066-6/+26
* | | Partially revert 0bfdd1dyuuji.yaginuma2018-04-071-1/+5
* | | Upgrade capybara to 3.0.1 to make sure our tests are passingRafael Mendonça França2018-04-061-1/+3
|/ /
* | Protect all active storage controllers agains CSRFRafael Mendonça França2018-04-065-5/+11
* | Add Brewfile to make easier to install all dependencies we need to run testsRafael Mendonça França2018-04-061-0/+13
* | Merge pull request #32481 from yhirano55/add_securing_rails_app_guide_link_to...Rafael França2018-04-061-0/+3
|\ \
| * | [ci skip] Add securing rails app guide link to credential sectionYoshiyuki Hirano2018-04-071-0/+3
| |/
* | Merge pull request #32355 from kamipo/delegate_to_klass_in_a_scopeRafael França2018-04-065-1/+30
|\ \
| * | Deprecate accessibility of private/protected class methods in named scopeRyuta Kamizono2018-03-304-4/+16
| * | Bring back private class methods accessibility in named scopeRyuta Kamizono2018-03-274-2/+19