diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 950afb7..55f399b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ # Order is important. The last matching pattern has the most precedence. -* @chef/chef-foundation-owners @chef/chef-foundation-approvers @chef/chef-foundation-reviewers -.expeditor/ @chef/jex-team -*.md @chef/docs-team +* @chef/chef-infra-owners @chef/chef-infra-approvers @chef/chef-infra-reviewers +.expeditor/ @chef/jex-team +*.md @chef/docs-team diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c11e1a0..34cbd71 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,7 @@ version: 2 updates: - package-ecosystem: bundler + target-branch: "main" directory: "/" schedule: interval: daily diff --git a/config/upstream.yml b/config/upstream.yml index e1590df..71c4883 100644 --- a/config/upstream.yml +++ b/config/upstream.yml @@ -430,13 +430,13 @@ Layout/ClassStructure: - prepend - extend ExpectedOrder: - - module_inclusion - - constants - - public_class_methods - - initializer - - public_methods - - protected_methods - - private_methods + - module_inclusion + - constants + - public_class_methods + - initializer + - public_methods + - protected_methods + - private_methods Layout/ClosingHeredocIndentation: Description: 'Checks the indentation of here document closings.' @@ -1900,7 +1900,7 @@ Lint/NestedPercentLiteral: VersionAdded: '0.52' Lint/NextWithoutAccumulator: - Description: >- + Description: >- Do not omit the accumulator when calling `next` in a `reduce`/`inject` block. Enabled: true @@ -3153,7 +3153,7 @@ Style/ClassMethodsDefinitions: StyleGuide: '#def-self-class-methods' Enabled: false VersionAdded: '0.89' - EnforcedStyle: def_self + EnforcedStyle: def_self SupportedStyles: - def_self - self_class @@ -3815,8 +3815,8 @@ Style/InverseMethods: :>: :<= # `ActiveSupport` defines some common inverse methods. They are listed below, # and not enabled by default. - #:present?: :blank?, - #:include?: :exclude? + # :present?: :blank?, + # :include?: :exclude? # `InverseBlocks` are methods that are inverted by inverting the return # of the block that is passed to the method InverseBlocks: diff --git a/lib/chefstyle/version.rb b/lib/chefstyle/version.rb index 8ebc2cd..212ca2e 100644 --- a/lib/chefstyle/version.rb +++ b/lib/chefstyle/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Chefstyle VERSION = "2.2.1" - RUBOCOP_VERSION = "1.25.0" + RUBOCOP_VERSION = "1.25.1" end