aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #33566 from yahonda/use_i18n_101Ryuta Kamizono2018-08-102-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Avoid i18n 1.1.0 for nowYasuo Honda2018-08-092-0/+2
|/ / / / / /
* | | | | | Merge pull request #33554 from saveriomiroddi/sav-correct_updated_at_guide_ex...Eileen M. Uchitelle2018-08-081-1/+1
|\ \ \ \ \ \
| * | | | | | ActiveRecord Basics guide: correct explanation of the `updated_at` logic [ci ...Saverio Miroddi2018-08-081-1/+1
* | | | | | | Merge pull request #33552 from seratch/fix-obvious-typosMatthew Draper2018-08-088-19/+19
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix a wrong correctionKazuhiro Sera2018-08-081-1/+1
| * | | | | | Fix the obvious typos detected by github.com/client9/misspellKazuhiro Sera2018-08-088-19/+19
|/ / / / / /
* | | | | | Merge pull request #33548 from Ana06/lambda-validationRafael França2018-08-071-0/+7
|\ \ \ \ \ \
| * | | | | | Add lambdas in conditional validationsAna María Martínez Gómez2018-08-071-0/+7
|/ / / / / /
* | | | | | Merge pull request #33541 from lsylvester/clean-template-method-namesEileen M. Uchitelle2018-08-072-1/+8
|\ \ \ \ \ \
| * | | | | | update BacktraceCleaner::RENDER_TEMPLATE_PATTERN to match the ActionView::Tem...Lachlan Sylvester2018-08-072-1/+8
|/ / / / / /
* | | | | | Camelize instead of classifyingGeorge Claghorn2018-08-061-1/+1
* | | | | | Merge pull request #33540 from joeltaylor/improve_service_adapter_error_handlingGeorge Claghorn2018-08-062-1/+9
|\ \ \ \ \ \
| * | | | | | Improve ActiveStorage service adapter error handlingJoel Taylor2018-08-062-1/+9
|/ / / / / /
* | | | | | Merge pull request #33533 from lsylvester/fix-irb-backtrace-cleaner-testMatthew Draper2018-08-061-5/+6
|\ \ \ \ \ \
| * | | | | | Filter backtrace in test to ensure irb counts as user codeLachlan Sylvester2018-08-061-5/+6
|/ / / / / /
* | | | | | Merge pull request #33531 from bogdanvlviv/move-changelog-entry-of-47018a82-upRyuta Kamizono2018-08-061-11/+11
|\ \ \ \ \ \
| * | | | | | Move changelog entry of 47018a82 up [ci skip]bogdanvlviv2018-08-051-11/+11
|/ / / / / /
* | | | | | Support skip nil for cache fetch (#25437)Martin2018-08-053-1/+23
* | | | | | Merge pull request #33454 from azbshiri/extend-affects-nested-attributesRichard Schneeman2018-08-043-2/+20
|\ \ \ \ \ \
| * | | | | | Call build when extend with nested attributes definedAlireza Bashiri2018-08-023-2/+20
* | | | | | | Merge pull request #33511 from albertoalmagro/change-references-from-rake-to-...Richard Schneeman2018-08-044-6/+7
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Change references from Rake task to Rails commandAlberto Almagro2018-08-014-6/+7
* | | | | | | | Fix uploading Tempfiles to Azure StorageGeorge Claghorn2018-08-032-1/+18
* | | | | | | | Merge pull request #33507 from jackc/patch-1George Claghorn2018-08-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix file upload location recommendationJack Christensen2018-08-011-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #33452 from thetizzo/rails_32_to_40_doc_updateGeorge Claghorn2018-08-031-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Update Rails 3.2 to 4.0 upgrade guide to include a mention and tip for handli...thetizzo2018-08-031-0/+11
* | | | | | | | | Merge pull request #33524 from spikeheap/masterPrem Sichanugrist2018-08-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Update adding member routes guide to fix inconsistency with the imp...Ryan Brooks2018-08-031-1/+1
|/ / / / / / / / /
* | | | | | | | | `retrieve_connection_pool` return a pool, not a connectionRyuta Kamizono2018-08-031-2/+2
* | | | | | | | | Remove another unused requireGeorge Claghorn2018-08-021-2/+0
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #33513 from twitnithegirl/only_connect_once_in_parallel_testsRyuta Kamizono2018-08-021-1/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | don't establish connection test_database since it gets established in load_sc...Britni Alexander2018-08-011-1/+0
|/ / / / / / /
* | | | | | | Remove unused requireGeorge Claghorn2018-08-011-2/+0
* | | | | | | Merge pull request #33479 from twitnithegirl/make_parallel_testing_db_fasterEileen M. Uchitelle2018-08-012-6/+9
|\ \ \ \ \ \ \
| * | | | | | | use load_schema instead of migrate for parallel testingBritni Alexander2018-07-312-6/+9
|/ / / / / / /
* | | | | | | Retry ActiveStorage::PurgeJobs on DB deadlockGeorge Claghorn2018-07-311-0/+1
* | | | | | | Merge pull request #33492 from kamipo/revert_breaking_default_order_contractRyuta Kamizono2018-08-013-22/+14
|\ \ \ \ \ \ \
| * | | | | | | Revert "Merge pull request #24131 from brchristian/limit_and_primary_key"Ryuta Kamizono2018-08-013-22/+1
| * | | | | | | Add test case for the #5153's default order contractRyuta Kamizono2018-08-011-0/+13
* | | | | | | | Merge pull request #28937 from maclover7/jm-fix-28927Rafael França2018-07-312-1/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Default content type for `head` is `text/html`Jon Moss2017-04-302-1/+15
* | | | | | | | Merge pull request #33490 from rails/revert-31883-remove-label-in-porgress-fo...Xavier Noria2018-07-311-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Remove label 'work in progress' for AM and AV guides"Xavier Noria2018-07-311-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #31883 from bogdanvlviv/remove-label-in-porgress-for-M-V-g...Richard Schneeman2018-07-311-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove label 'work in progress' for AM and AV guidesbogdanvlviv2018-02-041-2/+0
* | | | | | | | | Merge pull request #33488 from znz/avoid-to-post-twiceRafael França2018-07-311-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Throw if ujs loaded twiceKazuhiro NISHIYAMA2018-07-311-1/+2
* | | | | | | | | | Merge pull request #33489 from Atul9/remote-ipGeorge Claghorn2018-07-312-1/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |