Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.0/cleanup lifecycles #386

Merged
merged 11 commits into from
Mar 27, 2024
2 changes: 1 addition & 1 deletion etc/cpanfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ requires 'HTTP::Message', '>= 6.07';
requires 'IPC::Run3';
requires 'JavaScript::Minifier::XS';
requires 'JSON';
requires 'List::MoreUtils';
requires 'List::MoreUtils', '>= 0.420';
requires 'Locale::Maketext', '>= 1.06';
requires 'Locale::Maketext::Fuzzy', '>= 0.11';
requires 'Locale::Maketext::Lexicon', '>= 0.32';
Expand Down
5 changes: 2 additions & 3 deletions lib/RT/Config.pm
Original file line number Diff line number Diff line change
Expand Up @@ -3077,10 +3077,9 @@ sub LoadConfigFromDatabase {
: $type eq 'HASH' ? [ %$value ]
: [ $value ];

# hashes combine, but by default previous config settings shadow
# later changes, here we want database configs to shadow file ones.
# Unlike hashes in files that merge together, database configs are supposed to contain all the data, so no need
# to merge file configs. With it, admins are able to delete keys.
if ($type eq 'HASH') {
$val = [ $self->Get($name), @$val ];
$self->Set($name, ());
}

Expand Down
Loading
Loading