summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 15:44:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 15:44:42 +0000
commit4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch)
tree5423a1c7516cffe36384133ade12572cf709398d /.rubocop.yml
parente570267f2f6b326480d284e0164a6464ba4081bc (diff)
downloadgitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index a19cba5eb46..d086bdf7361 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -307,6 +307,9 @@ Cop/ActiveRecordAssociationReload:
- 'spec/**/*'
- 'ee/spec/**/*'
+Cop/ActiveModelErrorsDirectManipulation:
+ Enabled: true
+
Gitlab/AvoidFeatureGet:
Enabled: true
@@ -572,6 +575,9 @@ Rails/SaveBang:
- 'ee/spec/**/*.rb'
- 'qa/spec/**/*.rb'
- 'qa/qa/specs/**/*.rb'
+ Exclude:
+ - spec/models/wiki_page/**/*
+ - spec/models/wiki_page_spec.rb
Cop/PutProjectRoutesUnderScope:
Include: