aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Give GeneratedRelationMethods module a nameRyuta Kamizono2019-04-193-3/+16
* Revert renamed `GeneratedAttributeMethods`Ryuta Kamizono2019-04-191-3/+3
* Merge pull request #36033 from akinomaeni/hide_help_for_dev_commandYuji Yaginuma2019-04-191-2/+4
|\
| * Help command for visible commands should be hiddenakinomaeni2019-04-191-2/+4
|/
* Fix `yarn.lock`yuuji.yaginuma2019-04-191-5/+0
* Document redis: Object optionSteven Harman2019-04-181-5/+7
* Merge pull request #36012 from r7kamura/feature/safe-buffer-multiplicationRyuta Kamizono2019-04-193-0/+26
|\
| * Preserve html_safe? status on ActiveSupport::SafeBuffer#*r7kamura2019-04-193-0/+26
* | Merge pull request #36018 from aricwalker/parallel-setup-exceptionEileen M. Uchitelle2019-04-181-1/+10
|\ \
| * | If exception occurs during setup, add to each test executedAric Walker2019-04-181-1/+10
* | | Merge pull request #36023 from eileencodes/fix-active-record-to-not-require-r...Eileen M. Uchitelle2019-04-182-7/+9
|\ \ \ | |/ / |/| |
| * | Ensure active record can load without Railtieseileencodes2019-04-182-7/+9
|/ /
* | Merge pull request #36014 from utilum/update_rake_to_latest_versionRyuta Kamizono2019-04-181-1/+1
|\ \ | |/ |/|
| * Update Rake to the latest versionutilum2019-04-181-1/+1
|/
* Merge pull request #36010 from yoones/add-activestorage-instrumentation-hooks...George Claghorn2019-04-171-0/+25
|\
| * Mention more ActiveStorage hooks in Active Support Instrumentation guide [ci ...Younes SERRAJ2019-04-171-0/+25
* | Merge pull request #35052 from schuetzm/silence-i18n-fallback-deprecationKasper Timm Hansen2019-04-171-1/+2
|\ \
| * | Describe how to silence the deprecation warning about empty I18n fallbacksMarc Schütz2019-01-251-1/+2
* | | Merge pull request #36009 from abhaynikam/fix-model-generator-test-typoKasper Timm Hansen2019-04-171-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix typo in test description from generages -> generatesAbhay Nikam2019-04-171-1/+1
|/ /
* | Merge pull request #35886 from okuramasafumi/add-docs-to-concernRyuta Kamizono2019-04-171-1/+24
|\ \
| * | Add documentations to AS::Concern#included and #class_methodsokuramasafumi2019-04-171-0/+23
| * | Add `:nodoc` to ActiveSupport::Concern#append_featuresokuramasafumi2019-04-161-1/+1
* | | Merge pull request #36006 from prathamesh-sonpatki/rm-unused-requireRyuta Kamizono2019-04-171-1/+0
|\ \ \
| * | | Removed unused require for active_support/deprecationPrathamesh Sonpatki2019-04-171-1/+0
|/ / /
* | | Merge pull request #35987 from kamipo/fix_dirty_tracking_after_rollbackRyuta Kamizono2019-04-179-25/+92
|\ \ \
| * | | Fix dirty tracking after rollback.Ryuta Kamizono2019-04-169-25/+92
* | | | Prefer to indent and no blank line after private/protected [ci skip]Ryuta Kamizono2019-04-171-1/+1
* | | | Merge pull request #35984 from vishaltelangre/asn-misc-fixesJeremy Daer2019-04-163-10/+18
|\ \ \ \
| * | | | Add test coverageVishal Telangre2019-04-161-4/+13
| * | | | Remove @duration instance variable since we're not maintaining instances vari...Vishal Telangre2019-04-161-2/+1
| * | | | Use monotonic time to record `started` and `finished` time values for an even...Vishal Telangre2019-04-161-2/+2
| * | | | Fix: #cpu_time doesn't work for a `ActiveSupport::Notifications::Fanout::Subs...Vishal Telangre2019-04-161-2/+2
* | | | | [ci skip] More asset guide touch upsKasper Timm Hansen2019-04-171-4/+5
* | | | | Merge pull request #35994 from soartec-lab/update_guide_asset_pipeline_change...Kasper Timm Hansen2019-04-171-14/+6
|\ \ \ \ \
| * | | | | Guide updated in line with changes in rails commands [skip ci]soartec-lab2019-04-161-14/+6
* | | | | | Only retry tests on CIKasper Timm Hansen2019-04-171-1/+3
* | | | | | Fix bin/update references after 8927eba83cKasper Timm Hansen2019-04-173-10/+1
* | | | | | Merge pull request #33139 'bin-idempotent-setup'Kasper Timm Hansen2019-04-173-50/+14
|\ \ \ \ \ \
| * | | | | | Factorize bin/update in bin/setup, and make bin/setup idempotentDavid Stosik2019-04-173-50/+14
| * | | | | | Merge branch 'collection-cache-versioning'Kasper Timm Hansen2019-04-165-15/+93
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge pull request #34378 'collection-cache-versioning'Kasper Timm Hansen2019-04-165-15/+93
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * / / / / / Add collection cache versioningLachlan Sylvester2019-04-165-15/+93
|/ / / / / /
* | | | | | running test with_info_handler methodMauri Mustonen2019-04-162-1/+8
* | | | | | Merge pull request #35997 from tjoyal/Rails/MailersController/do-not-leak-I18...Rafael França2019-04-162-2/+12
|\ \ \ \ \ \
| * | | | | | [Rails::MailersController] Do not leak I18n global setting changesThierry Joyal2019-04-162-2/+12
* | | | | | | Merge pull request #35996 from utilum/warning_useless_useKasper Timm Hansen2019-04-161-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Squash warning: possibly useless use of a constantutilum2019-04-161-2/+2
|/ / / / / /
* | | | | | Merge pull request #35995 from soartec-lab/update_guide_command_line_sample_codeEileen M. Uchitelle2019-04-161-6/+5
|\ \ \ \ \ \
| * | | | | | Update the generate command sample codes [skip ci]soartec-lab2019-04-171-6/+5
|/ / / / / /