From 223ebf2c17861e2c4adbee2b00ffb2b36b45277a Mon Sep 17 00:00:00 2001
From: Siddharth Asthana <siddharthasthana31@gmail.com>
Date: Sat, 4 Dec 2021 22:40:17 +0530
Subject: [PATCH] Fix Gitlab/DelegatePredicateMethods offenses
Changelog: other
EE: true
---
.rubocop_todo/gitlab/delegate_predicate_methods.yml | 1 -
ee/app/models/license.rb | 8 +++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.rubocop_todo/gitlab/delegate_predicate_methods.yml b/.rubocop_todo/gitlab/delegate_predicate_methods.yml
index 90f64e0d2e74a..408eb6b6860b8 100644
--- a/.rubocop_todo/gitlab/delegate_predicate_methods.yml
+++ b/.rubocop_todo/gitlab/delegate_predicate_methods.yml
@@ -5,5 +5,4 @@ Gitlab/DelegatePredicateMethods:
- app/models/concerns/integrations/base_data_fields.rb
- app/models/project.rb
- ee/app/models/concerns/ee/ci/metadatable.rb
- - ee/app/models/license.rb
- lib/gitlab/ci/trace/stream.rb
diff --git a/ee/app/models/license.rb b/ee/app/models/license.rb
index e3c84092e2680..309c5a017480f 100644
--- a/ee/app/models/license.rb
+++ b/ee/app/models/license.rb
@@ -315,7 +315,13 @@ def all_plans
EE_ALL_PLANS
end
- delegate :block_changes?, :feature_available?, to: :current, allow_nil: true
+ def block_changes?
+ !!current&.block_changes?
+ end
+
+ def feature_available?(feature)
+ !!current&.feature_available?(feature)
+ end
def reset_current
cache.expire(CACHE_KEY)
--
GitLab