diff --git a/lib/rubocop/config_loader.rb b/lib/rubocop/config_loader.rb index dc0a765784e9..11358dc1e13c 100644 --- a/lib/rubocop/config_loader.rb +++ b/lib/rubocop/config_loader.rb @@ -153,12 +153,7 @@ def warn_on_pending_cops(pending_cops) warn Rainbow('For more information: https://docs.rubocop.org/rubocop/versioning.html').yellow end - # Merges the given configuration with the default one. If - # AllCops:DisabledByDefault is true, it changes the Enabled params so - # that only cops from user configuration are enabled. - # If AllCops::EnabledByDefault is true, it changes the Enabled params - # so that only cops explicitly disabled in user configuration are - # disabled. + # Merges the given configuration with the default one. def merge_with_default(config, config_file, unset_nil: true) resolver.merge_with_default(config, config_file, unset_nil: unset_nil) end