From f9d2a3e215a9dcf731cd0e2a3e1de1e9f50f6a0c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 19 Feb 2021 03:10:49 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .rubocop.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to '.rubocop.yml')

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