Merge branch 'master' into moderation

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d22f0f73ca82fd8a9e579a190ad6b64fb9b771a0..5846de44f47d987a1bf16d6f67a19dd7227617e2 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -55,11 +55,6 @@ Lint/InterpolationCheck:
   Exclude:
     - 'test/controllers/node_controller_test.rb'
 
-# Offense count: 2
-Lint/RescueWithoutErrorClass:
-  Exclude:
-    - 'app/helpers/browse_helper.rb'
-
 # Offense count: 2
 Lint/ShadowingOuterLocalVariable:
   Exclude:
@@ -82,7 +77,7 @@ Metrics/BlockNesting:
 # Offense count: 63
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1796
+  Max: 1797
 
 # Offense count: 71
 Metrics/CyclomaticComplexity:
@@ -227,3 +222,8 @@ Style/NumericLiterals:
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Enabled: false
+
+# Offense count: 2
+Style/RescueStandardError:
+  Exclude:
+    - 'app/helpers/browse_helper.rb'