From 87d90cb2bac047e3a2db55a465f5d00cb447dae0 Mon Sep 17 00:00:00 2001
From: Rutger Wessels <rwessels@gitlab.com>
Date: Tue, 8 Oct 2024 11:09:13 +0000
Subject: [PATCH] Allow rubocop exception for CurrentSettings
---
.rubocop.yml | 1 +
.rubocop_todo/gitlab/avoid_current_organization.yml | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/.rubocop.yml b/.rubocop.yml
index ee7a25c63d1e5..c20b30c45a151 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -519,6 +519,7 @@ Gitlab/AvoidCurrentOrganization:
- 'ee/lib/api/**/*'
- 'app/graphql/**/*'
- 'ee/app/graphql/**/*'
+ - 'lib/gitlab/current_settings.rb'
- 'lib/gitlab/middleware/organizations/current.rb'
- 'spec/**/*'
- 'ee/spec/**/*'
diff --git a/.rubocop_todo/gitlab/avoid_current_organization.yml b/.rubocop_todo/gitlab/avoid_current_organization.yml
index e5e11026f33e6..85bb28dcdd291 100644
--- a/.rubocop_todo/gitlab/avoid_current_organization.yml
+++ b/.rubocop_todo/gitlab/avoid_current_organization.yml
@@ -2,5 +2,4 @@
Gitlab/AvoidCurrentOrganization:
Details: grace period
Exclude:
- - 'lib/gitlab/current_settings.rb'
- 'lib/gitlab/github_gists_import/importer/gist_importer.rb'
--
GitLab