summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErick Sasse <esasse@gmail.com>2015-10-02 22:47:20 -0700
committerErick Sasse <esasse@gmail.com>2015-10-03 19:10:41 -0700
commit4fe2d75bda2af38dba2cc6deb9205ac20806eff4 (patch)
treef116f5111948dca6a2c3d37006cb5e9c2e61baa1
parent400f1a7f3ec0eeeecc5111d41872cbff474aa0f9 (diff)
downloadbundler-4fe2d75bda2af38dba2cc6deb9205ac20806eff4.tar.gz
Moves TrailingUnderscoreVariable to main rubocop file
-rw-r--r--.rubocop.yml3
-rw-r--r--.rubocop_todo.yml5
2 files changed, 3 insertions, 5 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 38bbcc04bb..3692909527 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -51,6 +51,9 @@ Style/StringLiteralsInInterpolation:
Style/TrailingComma:
EnforcedStyleForMultiline: comma
+Style/TrailingUnderscoreVariable:
+ Enabled: false
+
# 1.8.7 support
Style/HashSyntax:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6790383318..28d03d7693 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -180,8 +180,3 @@ Style/SpaceAroundEqualsInParameterDefault:
# Cop supports --auto-correct.
Style/SpaceInsideStringInterpolation:
Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/TrailingUnderscoreVariable:
- Enabled: false