summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 18:08:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 18:08:54 +0000
commit0d6fa033121a9bef708b8f2de186c4034c61d4a3 (patch)
tree851d65a09efbffa114c9a273e590d55cfb1436ab /.rubocop.yml
parent0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (diff)
downloadgitlab-ce-0d6fa033121a9bef708b8f2de186c4034c61d4a3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml14
1 files changed, 6 insertions, 8 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index e4d16d53193..d2cca0295ee 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -334,17 +334,15 @@ RSpec/UnspecifiedException:
# Work in progress. See https://gitlab.com/gitlab-org/gitlab/issues/196163
RSpec/HaveGitlabHttpStatus:
Enabled: true
+ Exclude:
+ - 'spec/support/matchers/have_gitlab_http_status.rb'
Include:
- - 'spec/support/shared_examples/**/*'
- - 'ee/spec/support/shared_examples/**/*'
+ - 'spec/support/**/*'
+ - 'ee/spec/support/**/*'
- 'spec/features/**/*'
- 'ee/spec/features/**/*'
- - 'spec/controllers/*.rb'
- - 'ee/spec/controllers/*.rb'
- - 'spec/controllers/projects/**/*.rb'
- - 'ee/spec/controllers/projects/**/*.rb'
- - 'spec/controllers/groups/**/*.rb'
- - 'ee/spec/controllers/groups/**/*.rb'
+ - 'spec/controllers/**/*'
+ - 'ee/spec/controllers/**/*'
- 'spec/requests/*.rb'
- 'ee/spec/requests/*.rb'