diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-27 21:09:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-27 21:09:54 +0300 |
commit | 03fbe61813666e96cd9b2dec9a22ab39f358f542 (patch) | |
tree | 786d9e6ad0e3ddf56709dad4dfabe963be378ebd /.rubocop.yml | |
parent | e69aae81ead38d4740771a5c8f0f33a4f248a312 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r-- | .rubocop.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 5f9fcbd9ec9..c48ea41ac33 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -9,6 +9,7 @@ require: inherit_from: - .rubocop_todo.yml - ./rubocop/rubocop-migrations.yml + - ./rubocop/rubocop-usage-data.yml inherit_mode: merge: |