From b595cb0c1dec83de5bdee18284abe86614bed33b Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 20 Jul 2022 15:40:28 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-2-stable-ee

---
 .rubocop.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index 47c7e5b5e35..4c7abe0dc89 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -13,8 +13,6 @@ inherit_from:
     <% end %>
   - '.rubocop_todo.yml'
   <% end %>
-  <%# See https://gitlab.com/gitlab-org/gitlab/-/issues/321982#rubymine-note for context on why namespaced_class has special handling here %>
-  - ./.rubocop_todo/gitlab/namespaced_class.yml
   - ./rubocop/rubocop-migrations.yml
   - ./rubocop/rubocop-usage-data.yml
   - ./rubocop/rubocop-code_reuse.yml
@@ -779,3 +777,6 @@ Migration/BackgroundMigrationBaseClass:
 
 Style/ClassAndModuleChildren:
   Enabled: true
+
+Fips/OpenSSL:
+  Enabled: false
-- 
cgit v1.2.3