summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2021-01-20 13:34:23 -0600
committerRobert Speicher <rspeicher@gmail.com>2021-01-20 13:34:23 -0600
commit6438df3a1e0fb944485cebf07976160184697d72 (patch)
tree00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /.rubocop.yml
parent42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff)
downloadgitlab-ce-6438df3a1e0fb944485cebf07976160184697d72.tar.gz
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml13
1 files changed, 13 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index b133ecbcf93..4a0cd9579e6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -48,6 +48,11 @@ Cop/StaticTranslationDefinition:
- 'spec/**/*'
- 'ee/spec/**/*'
+InternalAffairs/DeprecateCopHelper:
+ Enabled: true
+ Include:
+ - spec/rubocop/**/*.rb
+
Lint/LastKeywordArgument:
Enabled: true
Safe: false
@@ -321,6 +326,14 @@ RSpec/TimecopTravel:
- 'ee/spec/**/*.rb'
- 'qa/spec/**/*.rb'
+RSpec/WebMockEnable:
+ Enabled: true
+ Include:
+ - 'spec/**/*.rb'
+ - 'ee/spec/**/*.rb'
+ Exclude:
+ - 'spec/support/webmock.rb'
+
Naming/PredicateName:
Enabled: true
Exclude: