summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-29 18:08:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-29 18:08:47 +0000
commit6b9d3a4e8351e662c4586b24bb152de78ae9e3bf (patch)
tree883e9db60c047c54418fc1d2b1c5517f97e0f185 /.rubocop.yml
parent23288f62da73fb0e30d8e7ce306665e8fda1b932 (diff)
downloadgitlab-ce-6b9d3a4e8351e662c4586b24bb152de78ae9e3bf.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml6
1 files changed, 0 insertions, 6 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 46419e69e7e..1e34dc2480b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -235,12 +235,6 @@ RSpec/FactoriesInMigrationSpecs:
- 'spec/lib/ee/gitlab/background_migration/**/*.rb'
- 'ee/spec/lib/ee/gitlab/background_migration/**/*.rb'
-Cop/IncludeActionViewContext:
- Enabled: true
- Exclude:
- - 'spec/**/*'
- - 'ee/spec/**/*'
-
Cop/IncludeSidekiqWorker:
Enabled: true
Exclude: