aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixes configuration examples [ci skip]Xavier Noria2019-05-091-3/+3
* Merge pull request #36225 from deivid-rodriguez/workaround_sass_rails_require...Yuji Yaginuma2019-05-091-1/+1
|\
| * Use a better requirement for sass-rails 6 prereleasesDavid Rodríguez2019-05-091-1/+1
* | Merge pull request #36223 from sharang-d/revert-36214Ryuta Kamizono2019-05-091-1/+1
|\ \ | |/ |/|
| * Fix indentation of the config.eager_load nil warningSharang Dashputre2019-05-091-1/+1
|/
* Merge pull request #36216 from utilum/update_resque_schedulerRyuta Kamizono2019-05-091-16/+16
|\
| * bundle update resque-scheduler to latest versionutilum2019-05-081-16/+16
* | Merge pull request #36221 from jhawthorn/middleware_instrumentationRafael França2019-05-083-6/+17
|\ \
| * | Only build middleware proxy when instrumentatingJohn Hawthorn2019-05-083-6/+17
|/ /
* | documents restriction for explicit namespaces [ci skip]Xavier Noria2019-05-081-0/+34
* | documents how to use the classic autoloader in Rails 6 [ci skip]Xavier Noria2019-05-081-0/+11
* | Merge pull request #36214 from abhaynikam/36211-fix-indentationRafael França2019-05-081-5/+5
|\ \
| * | Fix indentation for config.eager_load nil warning messageAbhay Nikam2019-05-081-5/+5
| |/
* | Merge pull request #36215 from rmacklin/update-testing-guideVipul A M2019-05-081-1/+1
|\ \ | |/ |/|
| * Update testing guide to reflect changes from #36047Richard Macklin2019-05-081-1/+1
|/
* Auto-correct `Style/RedundantBegin` offenceRyuta Kamizono2019-05-081-5/+3
* Fix broken markup in CHANGELOG [ci skip]Ryuta Kamizono2019-05-081-8/+9
* Remove forward ported CHANGELOG [ci skip]Ryuta Kamizono2019-05-081-4/+0
* documents autoloading in the upgrading guide [ci skip]Xavier Noria2019-05-081-0/+172
* Merge pull request #36196 from st0012/fix-29947Eileen M. Uchitelle2019-05-078-4/+53
* Merge pull request #36203 from st0012/fix-command-in-contributing-guideRyuta Kamizono2019-05-081-1/+1
|\
| * Update directory name in sample commandsst00122019-05-081-1/+1
* | Typo in the release noteAkira Matsuda2019-05-081-1/+1
* | Merge pull request #36202 from yahonda/log_transactionRyuta Kamizono2019-05-086-23/+15
|\ \ | |/ |/|
| * Remove ignored_sql from SQLCounter by adding "TRANSACTION" to log nameYasuo Honda2019-05-086-23/+15
* | Merge pull request #36201 from soartec-lab/fix_typo_dot_positionVipul A M2019-05-071-1/+1
|\ \ | |/ |/|
| * Fixed typo of dot position [skip ci]soartec-lab2019-05-071-1/+1
|/
* Properly give defaults for DatabaseSelector optionsAkira Matsuda2019-05-071-3/+3
* Merge pull request #36190 from kamipo/should_attempt_tx_callbacks_to_all_recordsRyuta Kamizono2019-05-074-18/+71
|\
| * Should attempt `committed!`/`rolledback!` to all enrolled records in the tran...Ryuta Kamizono2019-05-074-18/+71
* | Merge pull request #36191 from st0012/remove-useless-methodRyuta Kamizono2019-05-071-5/+1
|\ \ | |/ |/|
| * Remove useless find_partial methodst00122019-05-071-5/+1
|/
* Remove useless `GC.start` in `test/template/render_test.rb`Ryuta Kamizono2019-05-061-14/+0
* Merge pull request #36189 from st0012/fix-36154Ryuta Kamizono2019-05-061-4/+9
|\
| * Clear Resolvers' cache after running RenderTestCases' test casesst00122019-05-061-4/+9
|/
* Make generated test work even when using virtual attributesyuuji.yaginuma2019-05-056-7/+56
* Fix test case name to fit file nameyuuji.yaginuma2019-05-041-1/+1
* Merge pull request #36172 from tgxworld/recover_pluck_perfRyuta Kamizono2019-05-041-0/+5
|\
| * Recover perf for `pluck` by reverting 9c9c950d02af83742a5f76302d0faa99508f242c.Guo Xiang Tan2019-05-031-0/+5
|/
* Merge pull request #36168 from yahonda/remove_redundant_test_too_many_binds_t...Ryuta Kamizono2019-05-031-20/+0
|\
| * Remove redundant `test_too_many_binds`Yasuo Honda2019-05-031-20/+0
* | Merge pull request #36167 from alecclarke/update-file-extension-used-in-guideYuji Yaginuma2019-05-031-1/+1
|\ \ | |/ |/|
| * [ci skip] Correct the stylesheet name used in the guide.Alec Clarke2019-05-021-1/+1
|/
* Merge pull request #36166 from alexcameron89/add_action_cable_rnAlex Kitchens2019-05-021-11/+30
|\
| * Add Action Cable Release Notes [ci skip]Alex Kitchens2019-05-021-11/+30
|/
* Merge pull request #36131 from Shopify/fix-association-extension-module-names...Xavier Noria2019-05-023-12/+12
|\
| * Namespace association extension modules under the owner modelJean Boussier2019-05-023-12/+12
|/
* Merge pull request #36152 from prathamesh-sonpatki/active-support-notesप्रथमेश Sonpatki2019-05-021-0/+186
|\
| * Update guides/source/6_0_release_notes.mdConnor Shea2019-05-021-1/+1
| * Added release notes for Active Support [ci skip]Prathamesh Sonpatki2019-05-021-0/+186
|/