gitlab-styles 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f34644596ecbfd782a8a8d5781251743cbe2f0ef079467416c4e15c784769693
-  data.tar.gz: 531fb802e1a50564fbbfad34e96f66b8a2227e6c182999750a39456f2ae17c98
+  metadata.gz: 88825b6aaa4961f16a29bfc14cdb1d590700a74e81fe68e072fccd2046506c6b
+  data.tar.gz: 5634afcb51a117e54f4760c43f12d3b2564d08b62bbcd49d97b7cde7c88014d6
 SHA512:
-  metadata.gz: 9a4036572db91754b18045e0e9ec40d9747a633773c49fb3edcdc53d0ac8b6ae2743f94ffe5fc2ce6cc8a60a51216eb7b85c89dfb039f747370cca4831c9cc41
-  data.tar.gz: 78eb2aaec9c221dad33fb99c719c3ad838a39f4978381b2f99ef011f87c8c8ee67a24d9b6e26af2eea4d1b3a03e03e80aab5c2718afaa998764a3cf68d8153e4
+  metadata.gz: 99652ceb45ae8e31ac3105bd7913a2c85e0a5a22cd97ad5d30081fd1b55b4d1734671d9cdbfdf1875dbdbc314efb9fe433b8859a18761ebea1d1054f58aa88d1
+  data.tar.gz: 2b16d7dc347ec66fd1656d735bc6427c485c88e27d7fb3030e0a852d76fb338705a976e85fb949b25b3994035134251da3771a9f3c914767d6d7158ecf5137e4

data/.gitlab-ci.yml

@@ -1,9 +1,9 @@
 stages:
-  - release
   - test
+  - deploy
 
 default:
-  image: ruby:2.6
+  image: ruby:2.7
   tags:
     - gitlab-org
   before_script:
@@ -29,17 +29,6 @@ specs:
   script:
     - bundle exec rspec
 
-release:
-  stage: release
-  rules:
-    - if: '$CI_COMMIT_TAG'
-  script:
-    - gem update --system
-    - ruby --version
-    - gem env version
-    - gem build gitlab-styles.gemspec
-    - gem push gitlab-styles*.gem
-  artifacts:
-    paths:
-      - gitlab-styles*.gem
-    expire_in: 30 days
+include:
+  - project: 'gitlab-org/quality/pipeline-common'
+    file: '/ci/gem-release.yml'

data/.gitlab/merge_request_templates/New Static Analysis Check.md

@@ -0,0 +1,21 @@
+## Description of the proposal
+
+<!--
+Please describe the proposal and add a link to the source (for example, http://www.betterspecs.org/).
+-->
+
+### Check-list
+
+- [ ] Mention this proposal in the relevant Slack channels (e.g. `#development`, `#backend`, `#frontend`)
+- [ ] If there is a choice to make between two potential styles, set up an emoji vote in the MR:
+  - CHOICE_A: :a:
+  - CHOICE_B: :b:
+  - Vote yourself for both choices so that people know these are the choices
+- [ ] The MR doesn't have significant objections, and is getting a majority of :+1: vs :-1: (remember that [we don't need to reach a consensus](https://about.gitlab.com/handbook/values/#collaboration-is-not-consensus))
+- [ ] (If applicable) One style is getting a majority of vote (compared to the other choice)
+- [ ] (If applicable) Update the MR with the chosen style
+- [ ] Follow the [review process](https://docs.gitlab.com/ee/development/code_review.html) as usual
+
+/label ~"Engineering Productivity" ~"development guidelines" ~"static code analysis"
+
+/cc @gitlab-org/maintainers/rails-backend

data/.gitlab/merge_request_templates/Release.md

@@ -7,7 +7,7 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-styles/commits/
 <!-- Keep the sections order but remove the empty sections -->
 
 ```markdown
-### New scenarios and scenario updates
+### New features and features updates
 
 - !aaa <Title of the aaa MR>.
 
@@ -19,7 +19,7 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-styles/commits/
 
 - !ccc <Title of the ccc MR>.
 
-### Other changes (CI, backstage)
+### Other changes (tooling, technical debt)
 
 - !ddd <Title of the ddd MR>.
 ```
@@ -30,6 +30,6 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-styles/commits/
   - [ ] Release notes are accurate.
 
 - Checklist after merging:
-  - [ ] [Create a tag for the new release version](docs/release_process.md#how-to).
+  - [ ] [Update the release notes for the newly created tag](docs/release_process.md#how-to).
 
-/label ~"Engineering Productivity" ~"tooling::workflow"
+/label ~"Engineering Productivity" ~"feature" ~"feature::maintenance" ~"static code analysis"

data/.rubocop.yml

@@ -1,3 +1,10 @@
 inherit_from:
   - rubocop-default.yml
-  - .rubocop_todo.yml
+
+require:
+  - rubocop/cop/internal_affairs
+
+InternalAffairs/DeprecateCopHelper:
+  Enabled: true
+  Include:
+    - spec/**/*.rb

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 group :test do
   # Pin these dependencies, otherwise a new rule could break the CI pipelines
-  gem 'rubocop', '0.89.1'
+  gem 'rubocop', '0.91.1'
   gem 'rubocop-rspec', '1.44.1'
   gem 'rspec-parameterized', '0.4.2', require: false
 end

data/gitlab-styles.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rubocop', '~> 0.89.1'
-  spec.add_dependency 'rubocop-gitlab-security', '~> 0.1.0'
-  spec.add_dependency 'rubocop-performance', '~> 1.8.1'
-  spec.add_dependency 'rubocop-rails', '~> 2.8'
+  spec.add_dependency 'rubocop', '~> 0.91.1'
+  spec.add_dependency 'rubocop-gitlab-security', '~> 0.1.1'
+  spec.add_dependency 'rubocop-performance', '~> 1.9.2'
+  spec.add_dependency 'rubocop-rails', '~> 2.9'
   spec.add_dependency 'rubocop-rspec', '~> 1.44'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/gitlab/styles/rubocop.rb

@@ -1,21 +1,8 @@
 # frozen_string_literal: true
 
-require 'gitlab/styles/rubocop/cop/custom_error_class'
-require 'gitlab/styles/rubocop/cop/gem_fetcher'
-require 'gitlab/styles/rubocop/cop/active_record_serialize'
-require 'gitlab/styles/rubocop/cop/redirect_with_status'
-require 'gitlab/styles/rubocop/cop/polymorphic_associations'
-require 'gitlab/styles/rubocop/cop/active_record_dependent'
-require 'gitlab/styles/rubocop/cop/in_batches'
-require 'gitlab/styles/rubocop/cop/line_break_after_guard_clauses'
-require 'gitlab/styles/rubocop/cop/code_reuse/active_record'
-require 'gitlab/styles/rubocop/cop/migration/update_large_table'
-require 'gitlab/styles/rubocop/cop/without_reactive_cache'
-require 'gitlab/styles/rubocop/cop/rspec/single_line_hook'
-require 'gitlab/styles/rubocop/cop/rspec/have_link_parameters'
-require 'gitlab/styles/rubocop/cop/rspec/verbose_include_metadata'
-require 'gitlab/styles/rubocop/cop/rspec/empty_line_after_shared_example'
-require 'gitlab/styles/rubocop/cop/rspec/empty_line_after_let_block'
+# Auto-require all cops under `gitlab/styles/rubocop/cop/**/*.rb`
+cops_glob = File.join(__dir__, 'rubocop', 'cop', '**', '*.rb')
+Dir[cops_glob].sort.each { |cop| require(cop) }
 
 module Gitlab
   module Styles

data/lib/gitlab/styles/rubocop/cop/active_record_dependent.rb

@@ -22,7 +22,7 @@ module Gitlab
             node.children.last.each_node(:pair) do |pair|
               key_name = pair.children[0].children[0]
 
-              add_offense(pair, location: :expression) if key_name == :dependent
+              add_offense(pair) if key_name == :dependent
             end
           end
         end

data/lib/gitlab/styles/rubocop/cop/custom_error_class.rb

@@ -21,7 +21,8 @@ module Gitlab
           MSG = 'Use `Class.new(SuperClass)` to define an empty custom error class.'
 
           def on_class(node)
-            _klass, parent, body = node.children
+            parent = node.parent_class
+            body = node.body
 
             return if body
 
@@ -29,11 +30,13 @@ module Gitlab
 
             return unless parent_klass&.to_s&.end_with?('Error')
 
-            add_offense(node, location: :expression)
+            add_offense(node)
           end
 
           def autocorrect(node)
-            klass, parent, _body = node.children
+            klass = node.identifier
+            parent = node.parent_class
+
             replacement = "#{class_name_from_node(klass)} = Class.new(#{class_name_from_node(parent)})"
 
             lambda do |corrector|

data/lib/gitlab/styles/rubocop/cop/gem_fetcher.rb

@@ -20,7 +20,7 @@ module Gitlab
 
             node.children.last.each_node(:pair) do |pair|
               key_name = pair.children[0].children[0].to_sym
-              add_offense(node, location: pair.source_range, message: MSG) if GIT_KEYS.include?(key_name)
+              add_offense(node, location: pair.source_range) if GIT_KEYS.include?(key_name)
             end
           end
 

data/lib/gitlab/styles/rubocop/cop/internal_affairs/deprecate_cop_helper.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Styles
+    module Rubocop
+      module Cop
+        module InternalAffairs
+          # Cop that denies the use of CopHelper.
+          class DeprecateCopHelper < RuboCop::Cop::Cop
+            MSG = 'Do not use `CopHelper` or methods from it, use improved patterns described in https://www.rubydoc.info/gems/rubocop/RuboCop/RSpec/ExpectOffense'
+
+            def_node_matcher :cop_helper, <<~PATTERN
+              (send nil? ${:include :extend :prepend}
+                (const _ {:CopHelper}))
+            PATTERN
+
+            def_node_search :cop_helper_method, <<~PATTERN
+              (send nil? {:inspect_source :inspect_source_file :parse_source :autocorrect_source_file :autocorrect_source :_investigate} ...)
+            PATTERN
+
+            def_node_search :cop_helper_method_on_instance, <<~PATTERN
+              (send (send nil? _) {:messages :highlights :offenses} ...)
+            PATTERN
+
+            def on_send(node)
+              cop_helper(node) do
+                add_offense(node)
+              end
+
+              cop_helper_method(node) do
+                add_offense(node)
+              end
+
+              cop_helper_method_on_instance(node) do
+                add_offense(node)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/styles/rubocop/cop/line_break_after_guard_clauses.rb

@@ -69,7 +69,7 @@ module Gitlab
             return unless guard_clause?(node)
             return if next_line(node).blank? || clause_last_line?(next_line(node)) || guard_clause?(next_sibling(node))
 
-            add_offense(node, location: :expression, message: MSG)
+            add_offense(node)
           end
 
           def autocorrect(node)

data/lib/gitlab/styles/rubocop/cop/line_break_around_conditional_block.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Styles
+    module Rubocop
+      module Cop
+        # Ensures a line break around conditional blocks.
+        #
+        # @example
+        #    # bad
+        #    do_something
+        #    if condition
+        #      do_extra_stuff
+        #    end
+        #    do_something_more
+        #
+        #    # good
+        #    do_something
+        #
+        #    if condition
+        #      do_extra_stuff
+        #    end
+        #
+        #    do_something_more
+        #
+        #    # bad
+        #    do_something
+        #    unless condition
+        #      do_extra_stuff
+        #    end
+        #
+        #    do_something_more
+        #
+        #    # good
+        #    def a_method
+        #      if condition
+        #        do_something
+        #      end
+        #    end
+        #
+        #    # good
+        #    on_block do
+        #      if condition
+        #        do_something
+        #      end
+        #    end
+        class LineBreakAroundConditionalBlock < RuboCop::Cop::Cop
+          include RuboCop::Cop::RangeHelp
+
+          MSG = 'Add a line break around conditional blocks'
+
+          def on_if(node)
+            # This cop causes errors in haml files, so let's skip those
+            return if in_haml?(node)
+            return if node.single_line?
+            return unless node.if? || node.unless?
+
+            add_offense(node) unless previous_line_valid?(node)
+            add_offense(node) unless last_line_valid?(node)
+          end
+
+          def autocorrect(node)
+            lambda do |corrector|
+              line = range_by_whole_lines(node.source_range)
+
+              corrector.insert_before(line, "\n") unless previous_line_valid?(node)
+              corrector.insert_after(line, "\n") unless last_line_valid?(node)
+            end
+          end
+
+          private
+
+          def previous_line_valid?(node)
+            previous_line(node).empty? ||
+              start_clause_line?(previous_line(node)) ||
+              block_start?(previous_line(node)) ||
+              begin_line?(previous_line(node)) ||
+              assignment_line?(previous_line(node)) ||
+              rescue_line?(previous_line(node))
+          end
+
+          def last_line_valid?(node)
+            last_line(node).empty? ||
+              end_line?(last_line(node)) ||
+              end_clause_line?(last_line(node))
+          end
+
+          def previous_line(node)
+            processed_source[node.loc.line - 2]
+          end
+
+          def last_line(node)
+            processed_source[node.loc.last_line]
+          end
+
+          def start_clause_line?(line)
+            line =~ /^\s*(def|=end|#|module|class|if|unless|else|elsif|ensure|when)/
+          end
+
+          def end_clause_line?(line)
+            line =~ /^\s*(#|rescue|else|elsif|when)/
+          end
+
+          def begin_line?(line)
+            # an assignment followed by a begin or ust a begin
+            line =~ /^\s*(@?(\w|\|+|=|\[|\]|\s)+begin|begin)/
+          end
+
+          def assignment_line?(line)
+            line =~ /^\s*.*=/
+          end
+
+          def rescue_line?(line)
+            line =~ /^\s*rescue/
+          end
+
+          def block_start?(line)
+            line.match(/ (do|{)( \|.*?\|)?\s?(#.+)?\z/)
+          end
+
+          def end_line?(line)
+            line =~ /^\s*(end|})/
+          end
+
+          def in_haml?(node)
+            node.location.expression.source_buffer.name.end_with?('.haml.rb')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/styles/rubocop/cop/migration/update_large_table.rb

@@ -40,7 +40,7 @@ module Gitlab
 
               return unless denied_tables.include?(table)
 
-              add_offense(node, location: :expression, message: format(MSG, update_method, table))
+              add_offense(node, message: format(MSG, update_method, table))
             end
 
             private

data/lib/gitlab/styles/rubocop/cop/polymorphic_associations.rb

@@ -19,7 +19,7 @@ module Gitlab
             node.children.last.each_node(:pair) do |pair|
               key_name = pair.children[0].children[0]
 
-              add_offense(pair, location: :expression) if key_name == :polymorphic
+              add_offense(pair) if key_name == :polymorphic
             end
           end
         end

data/lib/gitlab/styles/rubocop/cop/rspec/example_starting_character.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'rubocop-rspec'
+require_relative 'base'
+
+module Gitlab
+  module Styles
+    module Rubocop
+      module Cop
+        module RSpec
+          # Checks for common mistakes in example descriptions.
+          #
+          # This cop will correct docstrings that begin/end with space or words that start with a capital letter.
+          #
+          # @see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46336#note_442669518
+          #
+          # @example
+          #   # bad
+          #   it 'Does something' do
+          #   end
+          #
+          #   # good
+          #   it 'does nothing' do
+          #   end
+          #
+          # @example
+          #   # bad
+          #   it ' does something' do
+          #   end
+          #
+          #   # good
+          #   it 'does something' do
+          #   end
+          #
+          # @example
+          #   # bad
+          #   it 'does something ' do
+          #   end
+          #
+          #   # good
+          #   it 'does something' do
+          #   end
+          #
+          # @example
+          #   # bad
+          #   it ' does something ' do
+          #   end
+          #
+          #   # good
+          #   it 'does something' do
+          #   end
+          class ExampleStartingCharacter < Base
+            extend RuboCop::Cop::AutoCorrector
+
+            MSG = 'Only start words with lowercase alpha with no leading/trailing spaces when describing your tests.'
+
+            def_node_matcher :it_description, <<-PATTERN
+          (block (send _ :it ${
+            (str $_)
+            (dstr (str $_ ) ...)
+          } ...) ...)
+            PATTERN
+
+            def on_block(node)
+              it_description(node) do |description_node, _message|
+                add_wording_offense(description_node, MSG) if invalid_description?(text(description_node))
+              end
+            end
+
+            private
+
+            def add_wording_offense(node, message)
+              docstring = docstring(node)
+              add_offense(docstring, message: message) do |corrector|
+                corrector.replace(docstring, replacement_text(node))
+              end
+            end
+
+            def docstring(node)
+              expr = node.loc.expression
+
+              Parser::Source::Range.new(
+                expr.source_buffer,
+                expr.begin_pos + 1,
+                expr.end_pos - 1
+              )
+            end
+
+            def invalid_description?(message)
+              message.match?(/(^([A-Z]{1}[a-z]+\s|\s)|\s$)/)
+            end
+
+            def replacement_text(node)
+              text = text(node)
+
+              text.strip!
+
+              text = downcase_first_letter(text) if invalid_description?(text)
+
+              text
+            end
+
+            # Recursive processing is required to process nested dstr nodes
+            # that is the case for \-separated multiline strings with interpolation.
+            def text(node)
+              case node.type
+              when :dstr
+                node.node_parts.map { |child_node| text(child_node) }.join
+              when :str
+                node.value
+              when :begin
+                node.source
+              end
+            end
+
+            def downcase_first_letter(str)
+              str[0].downcase + str[1..]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/styles/rubocop/cop/rspec/verbose_include_metadata.rb

@@ -52,7 +52,7 @@ module Gitlab
 
             def invalid_metadata_matches(node, &block)
               include_metadata(node) do |matches|
-                matches.select(&method(:invalid_metadata?)).each(&block)
+                matches.select { |match| invalid_metadata?(match) }.each(&block)
               end
             end
 

data/lib/gitlab/styles/rubocop/rspec/helpers.rb

@@ -9,7 +9,7 @@ module Gitlab
         module Helpers
           include RuboCop::RSpec::Language
 
-          LET = SelectorSet.new(%i[let_it_be]) + Helpers::ALL
+          LET = SelectorSet.new(%i[let_it_be]) + RuboCop::RSpec::Language::Helpers::ALL
         end
       end
     end

data/lib/gitlab/styles/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Styles
-    VERSION = '5.0.0'
+    VERSION = '6.0.0'
   end
 end

data/rubocop-default.yml

@@ -20,3 +20,6 @@ inherit_from:
   - rubocop-rspec.yml
   - rubocop-security.yml
   - rubocop-style.yml
+
+InternalAffairs/DeprecateCopHelper:
+  Enabled: false

data/rubocop-layout.yml

@@ -12,6 +12,9 @@ Layout/ArrayAlignment:
 Layout/AssignmentIndentation:
   Enabled: true
 
+Layout/BeginEndAlignment: # (new in 0.91)
+  Enabled: true
+
 # Align block ends correctly.
 Layout/BlockAlignment:
   Enabled: true

data/rubocop-lint.yml

@@ -28,6 +28,9 @@ Lint/BinaryOperatorWithIdenticalOperands:
 Lint/CircularArgumentReference:
   Enabled: true
 
+Lint/ConstantDefinitionInBlock: # (new in 0.91)
+  Enabled: true
+
 # Check for debugger calls.
 Lint/Debugger:
   Enabled: true
@@ -47,6 +50,9 @@ Lint/DeprecatedOpenSSLConstant:
 Lint/DuplicateElsifCondition:
   Enabled: true
 
+Lint/DuplicateRequire: # (new in 0.90)
+  Enabled: true
+
 # Checks that there are no repeated exceptions used in 'rescue' expressions.
 # https://docs.rubocop.org/rubocop/0.89/cops_lint.html#lintduplicaterescueexception
 Lint/DuplicateRescueException:
@@ -69,6 +75,9 @@ Lint/EmptyConditionalBody:
 Lint/EmptyEnsure:
   Enabled: true
 
+Lint/EmptyFile: # (new in 0.90)
+  Enabled: true
+
 # Checks for the presence of `when` branches without a body.
 Lint/EmptyWhen:
   Enabled: true
@@ -94,6 +103,9 @@ Lint/FloatOutOfRange:
 Lint/FormatParameterMismatch:
   Enabled: true
 
+Lint/IdentityComparison: # (new in 0.91)
+  Enabled: true
+
 # Checks for adjacent string literals on the same line, which could better be
 # represented as a single string literal.
 Lint/ImplicitStringConcatenation:
@@ -200,6 +212,9 @@ Lint/SuppressedException:
 Lint/TopLevelReturnWithArgument:
   Enabled: true
 
+Lint/TrailingCommaInAttributeDeclaration: # (new in 0.90)
+  Enabled: true
+
 # Do not use prefix `_` for a variable that is used.
 Lint/UnderscorePrefixedVariableName:
   Enabled: true
@@ -238,10 +253,16 @@ Lint/UselessAssignment:
 Lint/UselessElseWithoutRescue:
   Enabled: true
 
+Lint/UselessMethodDefinition: # (new in 0.90)
+  Enabled: true
+
 # Checks for useless setter call to a local variable.
 Lint/UselessSetterCall:
   Enabled: true
 
+Lint/UselessTimes: # (new in 0.91)
+  Enabled: true
+
 # Possible use of operator/literal/variable in void context.
 Lint/Void:
   Enabled: true

data/rubocop-performance.yml

@@ -10,6 +10,9 @@ Performance/AncestorsInclude:
 Performance/BigDecimalWithNumericArgument:
   Enabled: true
 
+Performance/BlockGivenWithExplicitBlock: # (new in 1.9)
+  Enabled: true
+
 # Use `caller(n..n)` instead of `caller`.
 Performance/Caller:
   Enabled: false
@@ -18,11 +21,20 @@ Performance/Caller:
 Performance/Casecmp:
   Enabled: true
 
+Performance/CollectionLiteralInLoop: # (new in 1.8)
+  Enabled: true
+
+Performance/ConstantRegexp: # (new in 1.9)
+  Enabled: true
+
 # Use `str.{start,end}_with?(x, ..., y, ...)` instead of
 # `str.{start,end}_with?(x, ...) || str.{start,end}_with?(y, ...)`.
 Performance/DoubleStartEndWith:
   Enabled: true
 
+Performance/MethodObjectAsBlock: # (new in 1.9)
+  Enabled: true
+
 # Use `Range#cover?` instead of `Range#include?`.
 Performance/RangeInclude:
   Enabled: true

data/rubocop-rails.yml

@@ -24,6 +24,9 @@ Rails/AfterCommitOverride:
 Rails/ApplicationRecord:
   Enabled: false
 
+Rails/AttributeDefaultBlockValue: # (new in 2.9)
+  Enabled: true
+
 # Enforce using `blank?` and `present?`.
 Rails/Blank:
   Enabled: false
@@ -168,6 +171,9 @@ Rails/TimeZone:
 Rails/Validation:
   Enabled: true
 
+Rails/WhereEquals: # (new in 2.9)
+  Enabled: true
+
 # Enforces consistent style when using exists?.
 # https://docs.rubocop.org/rubocop-rails/2.8/cops_rails.html#railswhereexists
 Rails/WhereExists:

data/rubocop-style.yml

@@ -13,6 +13,7 @@ Style/Alias:
 # or completely (always).
 Style/AndOr:
   Enabled: true
+  EnforcedStyle: always
 
 # Enforces the use of Array() instead of explicit Array check or [*var]
 # https://docs.rubocop.org/rubocop/0.89/cops_style.html#stylearraycoercion
@@ -83,6 +84,9 @@ Style/ClassVars:
 Style/ColonMethodCall:
   Enabled: true
 
+Style/CombinableLoops: # (new in 0.90)
+  Enabled: true
+
 # This cop checks that comment annotation keywords are written according
 # to guidelines.
 Style/CommentAnnotation:
@@ -201,6 +205,9 @@ Style/InfiniteLoop:
 Style/InverseMethods:
   Enabled: false
 
+Style/KeywordParametersOrder: # (new in 0.90)
+  Enabled: true
+
 # Use lambda.call(...) instead of lambda.(...).
 Style/LambdaCall:
   Enabled: true
@@ -334,6 +341,9 @@ Style/RedundantRegexpCharacterClass:
 Style/RedundantRegexpEscape:
   Enabled: true
 
+Style/RedundantSelfAssignment: # (new in 0.90)
+  Enabled: true
+
 # Use `sort` instead of `sort_by { |x| x }`.
 Style/RedundantSortBy:
   Enabled: true
@@ -357,6 +367,9 @@ Style/SignalException:
 Style/SlicingWithRange:
   Enabled: true
 
+Style/SoleNestedConditional: # (new in 0.89)
+  Enabled: true
+
 # Check for the usage of parentheses around stabby lambda arguments.
 Style/StabbyLambdaParentheses:
   EnforcedStyle: require_parentheses

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-styles
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.89.1
+        version: 0.91.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.89.1
+        version: 0.91.1
 - !ruby/object:Gem::Dependency
   name: rubocop-gitlab-security
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -132,10 +132,10 @@ files:
 - ".editorconfig"
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".gitlab/merge_request_templates/New Static Analysis Check.md"
 - ".gitlab/merge_request_templates/Release.md"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -153,13 +153,16 @@ files:
 - lib/gitlab/styles/rubocop/cop/custom_error_class.rb
 - lib/gitlab/styles/rubocop/cop/gem_fetcher.rb
 - lib/gitlab/styles/rubocop/cop/in_batches.rb
+- lib/gitlab/styles/rubocop/cop/internal_affairs/deprecate_cop_helper.rb
 - lib/gitlab/styles/rubocop/cop/line_break_after_guard_clauses.rb
+- lib/gitlab/styles/rubocop/cop/line_break_around_conditional_block.rb
 - lib/gitlab/styles/rubocop/cop/migration/update_large_table.rb
 - lib/gitlab/styles/rubocop/cop/polymorphic_associations.rb
 - lib/gitlab/styles/rubocop/cop/redirect_with_status.rb
 - lib/gitlab/styles/rubocop/cop/rspec/base.rb
 - lib/gitlab/styles/rubocop/cop/rspec/empty_line_after_let_block.rb
 - lib/gitlab/styles/rubocop/cop/rspec/empty_line_after_shared_example.rb
+- lib/gitlab/styles/rubocop/cop/rspec/example_starting_character.rb
 - lib/gitlab/styles/rubocop/cop/rspec/have_link_parameters.rb
 - lib/gitlab/styles/rubocop/cop/rspec/single_line_hook.rb
 - lib/gitlab/styles/rubocop/cop/rspec/verbose_include_metadata.rb

data/.rubocop_todo.yml

@@ -1,7 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2017-11-03 15:49:59 +0100 using RuboCop version 0.51.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.