diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-19 06:10:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-19 06:10:49 +0300 |
| commit | f9d2a3e215a9dcf731cd0e2a3e1de1e9f50f6a0c (patch) | |
| tree | d3976271a7632ab25f1de4553d68676591e9ee47 /.rubocop.yml | |
| parent | 6f5b1492ab0eb74f7594a97d94c10199708c7fd3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
| -rw-r--r-- | .rubocop.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 7a4b53b5aa5..a4a74aa4100 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,8 +7,10 @@ require: - rubocop-rspec inherit_from: - - .rubocop_manual_todo.yml - - .rubocop_todo.yml + <% unless ENV['REVEAL_RUBOCOP_TODO'] == '1' %> + - '.rubocop_manual_todo.yml' + - '.rubocop_todo.yml' + <% end %> - ./rubocop/rubocop-migrations.yml - ./rubocop/rubocop-usage-data.yml - ./rubocop/rubocop-code_reuse.yml |