summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Neel <brian@gitlab.com>2017-06-15 02:27:55 +0000
committerBrian Neel <brian@gitlab.com>2017-06-15 02:27:55 +0000
commitba28d8fc59790c3a7bd59df62198215d4eb05560 (patch)
tree2f5ee941fd057afa3785b56289798042ec968b18
parentc96d8105c76ded12031bde3d2cd4996c5b511f62 (diff)
downloadgitlab-ce-revert-c96d8105.tar.gz
Revert "Remove missing cops from .rubocop_todo.yml and rename Lint/Eval in .rubocop.yml"revert-c96d8105
This reverts commit c96d8105c76ded12031bde3d2cd4996c5b511f62
-rw-r--r--.rubocop.yml8
-rw-r--r--.rubocop_todo.yml80
2 files changed, 84 insertions, 4 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index b42f76019f7..754023afdb4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -604,10 +604,6 @@ Metrics/PerceivedComplexity:
# Lint ########################################################################
-# This cop checks for the use of *Kernel#eval*.
-Lint/Eval:
- Enabled: true
-
# Checks for ambiguous operators in the first argument of a method invocation
# without parentheses.
Lint/AmbiguousOperator:
@@ -868,6 +864,10 @@ Performance/TimesMap:
Security/JSONLoad:
Enabled: true
+# This cop checks for the use of *Kernel#eval*.
+Security/Eval:
+ Enabled: true
+
# Rails #######################################################################
# Enables Rails cops.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 33c91a2c6ea..e2d9c37479d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,6 +6,81 @@
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
+# Offense count: 54
+RSpec/BeforeAfterAll:
+ Enabled: false
+
+# Offense count: 233
+RSpec/EmptyLineAfterFinalLet:
+ Enabled: false
+
+# Offense count: 167
+RSpec/EmptyLineAfterSubject:
+ Enabled: false
+
+# Offense count: 72
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: implicit, each, example
+RSpec/HookArgument:
+ Enabled: false
+
+# Offense count: 12
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: is_expected, should
+RSpec/ImplicitExpect:
+ Enabled: false
+
+# Offense count: 11
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: it_behaves_like, it_should_behave_like
+RSpec/ItBehavesLike:
+ Enabled: false
+
+# Offense count: 4
+RSpec/IteratedExpectation:
+ Enabled: false
+
+# Offense count: 3
+RSpec/OverwritingSetup:
+ Enabled: false
+
+# Offense count: 34
+RSpec/RepeatedExample:
+ Enabled: false
+
+# Offense count: 43
+RSpec/ScatteredLet:
+ Enabled: false
+
+# Offense count: 32
+RSpec/ScatteredSetup:
+ Enabled: false
+
+# Offense count: 1
+RSpec/SharedContext:
+ Enabled: false
+
+# Offense count: 150
+Rails/FilePath:
+ Enabled: false
+
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: db/migrate/*.rb
+Rails/ReversibleMigration:
+ Enabled: false
+
+# Offense count: 302
+# Configuration parameters: Blacklist.
+# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
+Rails/SkipsModelValidations:
+ Enabled: false
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Security/YAMLLoad:
+ Enabled: false
+
# Offense count: 59
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -97,6 +172,11 @@ Style/Lambda:
Style/LineEndConcatenation:
Enabled: false
+# Offense count: 34
+# Cop supports --auto-correct.
+Style/MethodCallWithoutArgsParentheses:
+ Enabled: false
+
# Offense count: 10
Style/MethodMissing:
Enabled: false