diff --git a/rubocop.yml b/rubocop.yml index 06653173..b0afb085 100644 --- a/rubocop.yml +++ b/rubocop.yml @@ -381,8 +381,7 @@ Naming/InclusiveLanguage: - !ruby/regexp /\w*:\/\/\S+/ # URLs (e.g. https://github.com/org/repo/blob/master/README.md) - !ruby/regexp '/(?:blob|tree)/master/' # e.g. github.com/org/repo/blob/master/README.md, without https:// - !ruby/regexp '/origin[ \/]master/' # Legacy default git branch name - - 'mastercard' - - 'webmaster' + - !ruby/regexp '/(?<=[a-z])master|master(?=[a-z])/' # "master" substring within a longer word Naming/MemoizedInstanceVariableName: Enabled: false diff --git a/test/fixtures/full_config.yml b/test/fixtures/full_config.yml index acf8939c..a27f0c45 100644 --- a/test/fixtures/full_config.yml +++ b/test/fixtures/full_config.yml @@ -2137,8 +2137,7 @@ Naming/InclusiveLanguage: - !ruby/regexp /\w*:\/\/\S+/ - !ruby/regexp /(?:blob|tree)\/master/ - !ruby/regexp /origin[ \/]master/ - - mastercard - - webmaster + - !ruby/regexp /(?<=[a-z])master|master(?=[a-z])/ Naming/MemoizedInstanceVariableName: Description: Memoized method name should match memo instance variable name. Enabled: false