aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #33832 from bogdanvlviv/follow-up-33756Rafael França2018-09-125-31/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add mention about `ActiveRecord::Base::filter_attributes` to the changelog entrybogdanvlviv2018-09-122-8/+13
| * | | | | | | | | Build string set when `filter_attributes` is assignedbogdanvlviv2018-09-122-7/+19
| * | | | | | | | | DRY `activerecord/lib/active_record/core.rb` and fix testsbogdanvlviv2018-09-122-20/+27
| * | | | | | | | | Clarify docs of `config.filter_parameters` and `#filter_attributes`bogdanvlviv2018-09-122-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #33856 from eileencodes/fix-query-cache-to-load-before-fir...Eileen M. Uchitelle2018-09-122-3/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix query cache to load before first requestEileen Uchitelle2018-09-122-3/+34
|/ / / / / / / / /
* | | | | | | | | Merge pull request #33852 from sharang-d/patch-2Yuji Yaginuma2018-09-121-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update test_helper_test.rbSharang Dashputre2018-09-121-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #33848 from sharang-d/patch-2Rafael França2018-09-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update action_mailer_basics.md [ci skip]Sharang Dashputre2018-09-121-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #33819 from kevindew/yarn-pathRafael França2018-09-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Run yarn install relative to Rails.rootKevin Dew2018-09-071-1/+1
* | | | | | | | | Merge pull request #33483 from DylanReile/masterRafael França2018-09-111-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disable content security policy for mailer previewsDylan Reile2018-07-301-0/+2
* | | | | | | | | | Merge pull request #27792 from tjoyal/sandbox-tagged-loggingRafael Mendonça França2018-09-113-10/+35
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | TaggedLogging to return a new logger instanceThierry Joyal2017-02-273-10/+34
* | | | | | | | | | Merge pull request #33821 from schneems/schneems/digester-no-arrayRichard Schneeman2018-09-112-10/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move digest path calculation out of loopschneems2018-09-112-10/+22
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #33815 from mberlanda/mberlanda/enhance-config-forRafael França2018-09-112-3/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | refacto: config_for with ActiveSupport::InheritableOptions and symbolized keysMauro Berlanda2018-09-112-3/+53
* | | | | | | | | | | use "minitest" consistentlyXavier Noria2018-09-1117-21/+19
* | | | | | | | | | | Merge pull request #33795 from marceloperini/marceloperini/33450-active-storageRafael França2018-09-113-1/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix zero-byte files uploadMarcelo Perini Veloso2018-09-063-1/+12
* | | | | | | | | | | | Merge pull request #33785 from bogdanvlviv/follow-up-33773-33779Rafael França2018-09-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Clarify changelog entry added in #33779 [ci skip]bogdanvlviv2018-09-031-1/+1
* | | | | | | | | | | | | Merge pull request #33824 from yskkin/suppress_loggingRafael França2018-09-117-23/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add `perform_deliveries` to a payload of `deliver.action_mailer` notification.Yoshiyuki Kinjo2018-09-095-27/+41
| * | | | | | | | | | | | | Skip delivery notification when perform_deliveries is false.Yoshiyuki Kinjo2018-09-085-1/+22
* | | | | | | | | | | | | | Use utf8mb4 character set by default for MySQL database (#33608)Yasuo Honda2018-09-119-12/+25
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Don't expose `instantiate_instance_of` for internal useRyuta Kamizono2018-09-111-11/+7
* | | | | | | | | | | | | Refactor object creation from relation to avoid pushing scope attributesRyuta Kamizono2018-09-112-24/+7
* | | | | | | | | | | | | Don't expose `current_scope` for internal useRyuta Kamizono2018-09-113-18/+17
* | | | | | | | | | | | | Move `scoping` handling into klass level from relationRyuta Kamizono2018-09-112-5/+9
* | | | | | | | | | | | | Remove redundant `all.scoping`Ryuta Kamizono2018-09-111-4/+2
* | | | | | | | | | | | | Remove unused `existing` arg in `SelectManager#collapse`Ryuta Kamizono2018-09-111-3/+3
* | | | | | | | | | | | | Merge pull request #33639 from darwin67/33610-duplicated-nested-records-with-...Ryuta Kamizono2018-09-115-7/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixes #33610Darwin D Wu2018-09-115-7/+61
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Use correct variableyuuji.yaginuma2018-09-112-6/+6
* | | | | | | | | | | | | Oxford comma [ci skip]Xavier Noria2018-09-101-1/+1
* | | | | | | | | | | | | Merge pull request #33823 from stoodfarback/aj_backburner_fix_priorityRafael França2018-09-102-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ActiveJob Backburner adapter: fix prioritystoodfarback2018-09-072-2/+14
* | | | | | | | | | | | | | Merge pull request #33813 from ryanwhocodes/masterXavier Noria2018-09-103-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add #unfreeze_time to ActiveSupport::Testing::TimeHelpersryanwhocodes2018-09-103-1/+12
* | | | | | | | | | | | | | | Remove all references to slave in the codebaseRafael Mendonça França2018-09-104-30/+30
* | | | | | | | | | | | | | | Merge pull request #33837 from nickstanish/masterRyuta Kamizono2018-09-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update CHANGELOG.mdNick Stanish2018-09-101-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #33826 from tgturner/activejob-retry-attemptsEileen M. Uchitelle2018-09-091-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | clarifies documentation around the attempts arugment to retry_onGraham Turner2018-09-091-1/+3
* | | | | | | | | | | | | | | Merge pull request #33825 from bogdanvlviv/follow-up-33637-and-33770Eileen M. Uchitelle2018-09-094-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \