summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-20 13:18:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-20 13:18:24 +0000
commit0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch)
tree4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /.rubocop.yml
parent744144d28e3e7fddc117924fef88de5d9674fe4c (diff)
downloadgitlab-ce-0653e08efd039a5905f3fa4f6e9cef9f5d2f799c.tar.gz
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml15
1 files changed, 13 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 7b2b8ca70f5..141ba874b21 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -38,8 +38,9 @@ AllCops:
- 'workhorse/**/*'
- 'spec/support/*.git/**/*' # e.g. spec/support/gitlab-git-test.git
- 'db/ci_migrate/*.rb' # since the `db/ci_migrate` is a symlinked to `db/migrate`
- CacheRootDirectory: tmp
- MaxFilesInCache: 25000
+ # Use absolute path to avoid orphan directories with changed workspace root.
+ CacheRootDirectory: <%= Dir.getwd %>/tmp
+ MaxFilesInCache: 30000
Cop/AvoidKeywordArgumentsInSidekiqWorkers:
Enabled: true
@@ -711,3 +712,13 @@ QA/SelectorUsage:
- 'ee/spec/**/*.rb'
Exclude:
- 'spec/rubocop/**/*_spec.rb'
+
+Performance/ActiveRecordSubtransactions:
+ Exclude:
+ - 'spec/**/*.rb'
+ - 'ee/spec/**/*.rb'
+
+Performance/ActiveRecordSubtransactionMethods:
+ Exclude:
+ - 'spec/**/*.rb'
+ - 'ee/spec/**/*.rb'