summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-20 13:37:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-20 13:37:47 +0000
commitaee0a117a889461ce8ced6fcf73207fe017f1d99 (patch)
tree891d9ef189227a8445d83f35c1b0fc99573f4380 /.rubocop.yml
parent8d46af3258650d305f53b819eabf7ab18d22f59e (diff)
downloadgitlab-ce-aee0a117a889461ce8ced6fcf73207fe017f1d99.tar.gz
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 5b7a58e1f2d..2280fe222ea 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,7 +8,9 @@ require:
inherit_from:
<% unless ENV['REVEAL_RUBOCOP_TODO'] == '1' %>
- - '.rubocop_manual_todo.yml'
+ <% Dir.glob('.rubocop_todo/**/*.yml').each do |rubocop_todo_yaml| %>
+ - '<%= rubocop_todo_yaml %>'
+ <% end %>
- '.rubocop_todo.yml'
<% end %>
- ./rubocop/rubocop-migrations.yml