diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-05 21:08:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-05 21:08:48 +0300 |
| commit | 3e1c760141a27097d74d191a619fa6edecd86fe7 (patch) | |
| tree | dc26e1842b355d2ebad6c8923077b0a016aa82c9 /.rubocop.yml | |
| parent | 74dd67ddea70f70830f3fe1ca65b06b604ec229f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 13448a918b8..bcdc8251033 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,9 +7,11 @@ require: - rubocop-rspec inherit_from: + - .rubocop_manual_todo.yml - .rubocop_todo.yml - ./rubocop/rubocop-migrations.yml - ./rubocop/rubocop-usage-data.yml + - ./rubocop/rubocop-code_reuse.yml inherit_mode: merge: |