rubocop-lint.yml in gitlab-styles-2.3.2 vs rubocop-lint.yml in gitlab-styles-2.4.0

@@ -16,31 +16,19 @@
 # This cop checks for assignments in the conditions of
 # if/while/until.
 Lint/AssignmentInCondition:
   Enabled: false
 
-# Align block ends correctly.
-Lint/BlockAlignment:
-  Enabled: true
-
 # Default values in optional keyword arguments and optional ordinal arguments
 # should not refer back to the name of the argument.
 Lint/CircularArgumentReference:
   Enabled: true
 
-# Checks for condition placed in a confusing position relative to the keyword.
-Lint/ConditionPosition:
-  Enabled: true
-
 # Check for debugger calls.
 Lint/Debugger:
   Enabled: true
 
-# Align ends corresponding to defs correctly.
-Lint/DefEndAlignment:
-  Enabled: true
-
 # Check for deprecated class method calls.
 Lint/DeprecatedClassMethods:
   Enabled: true
 
 # Check for immutable argument given to each_with_object.
@@ -57,14 +45,10 @@
 
 # Checks for the presence of `when` branches without a body.
 Lint/EmptyWhen:
   Enabled: true
 
-# Align ends correctly.
-Lint/EndAlignment:
-  Enabled: true
-
 # END blocks should not be placed inside method definitions.
 Lint/EndInMethod:
   Enabled: true
 
 # Do not use return in an ensure block.
@@ -148,15 +132,9 @@
   Enabled: true
 
 # This cop checks for using Fixnum or Bignum constant
 Lint/UnifiedInteger:
   Enabled: true
-
-# Checks for rubocop:disable comments that can be removed.
-# Note: this cop is not disabled when disabling all cops.
-# It must be explicitly disabled.
-Lint/UnneededDisable:
-  Enabled: false
 
 # This cop checks for unneeded usages of splat expansion
 Lint/UnneededSplatExpansion:
   Enabled: false