summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.rubocop.yml8
-rw-r--r--.rubocop_todo.yml8
2 files changed, 8 insertions, 8 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index cc902e550b..27dd129443 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -14,10 +14,6 @@ AllCops:
Lint/AssignmentInCondition:
Enabled: false
-Lint/EndAlignment:
- EnforcedStyleAlignWith: variable
- AutoCorrect: true
-
Lint/UnusedMethodArgument:
Enabled: false
@@ -33,6 +29,10 @@ Layout/AccessModifierIndentation:
Layout/AlignParameters:
EnforcedStyle: with_fixed_indentation
+Layout/EndAlignment:
+ EnforcedStyleAlignWith: variable
+ AutoCorrect: true
+
Layout/MultilineOperationIndentation:
EnforcedStyle: indented
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e3e8c5a3fd..f50af1f3fa 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -86,10 +86,6 @@ Lint/RescueException:
- 'lib/bundler/rubygems_integration.rb'
- 'lib/bundler/worker.rb'
-# Offense count: 29
-Lint/RescueStandardError:
- Enabled: false
-
# Offense count: 2
Lint/ShadowedException:
Exclude:
@@ -282,6 +278,10 @@ Style/InverseMethods:
- 'lib/bundler/resolver.rb'
- 'lib/bundler/resolver/spec_group.rb'
+# Offense count: 29
+Style/RescueStandardError:
+ Enabled: false
+
# Offense count: 6
Style/MethodMissingSuper:
Exclude: