From aee0a117a889461ce8ced6fcf73207fe017f1d99 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Dec 2021 13:37:47 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-6-stable-ee

---
 .rubocop.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.rubocop.yml')

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
-- 
cgit v1.2.3