summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-27 12:08:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-27 12:08:35 +0000
commit22e9af3c8b8aedf7f46b786be968862b74a2d07e (patch)
treea10a7d9af40a17fe6cda7b3a681f5e5e2112c16e /.rubocop.yml
parentc8e28a0bb8dd45d91cb72ff2c930bc4a562f1fc7 (diff)
downloadgitlab-ce-22e9af3c8b8aedf7f46b786be968862b74a2d07e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml9
1 files changed, 3 insertions, 6 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index ae6f633fd60..860d57d89a0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -301,12 +301,6 @@ RSpec/AnyInstanceOf:
Enabled: false
# Cops for upgrade to gitlab-styles 3.1.0
-RSpec/ReceiveCounts:
- Enabled: false
-
-RSpec/ContextMethod:
- Enabled: false
-
RSpec/ImplicitSubject:
Enabled: false
@@ -343,6 +337,7 @@ RSpec/MissingExampleGroupArgument:
RSpec/UnspecifiedException:
Enabled: false
+# Work in progress. See https://gitlab.com/gitlab-org/gitlab/issues/196163
RSpec/HaveGitlabHttpStatus:
Enabled: true
Include:
@@ -350,6 +345,8 @@ RSpec/HaveGitlabHttpStatus:
- 'ee/spec/support/shared_examples/**/*'
- 'spec/features/**/*'
- 'ee/spec/features/**/*'
+ - 'spec/controllers/*.rb'
+ - 'ee/spec/controllers/*.rb'
Style/MultilineWhenThen:
Enabled: false