Skip to content

Commit

Permalink
Remove duplicated comment
Browse files Browse the repository at this point in the history
This comment already exists in the ConfigLoaderResolver. I think that
level of details is a better fit there and it doesn't make sense to
maintain it duplicated.
  • Loading branch information
deivid-rodriguez authored and bbatsov committed Jun 24, 2020
1 parent 90dab86 commit 15bcad7
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions lib/rubocop/config_loader.rb
Expand Up @@ -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
Expand Down

0 comments on commit 15bcad7

Please sign in to comment.