diff --git a/.rubocop_todo/gitlab/delegate_predicate_methods.yml b/.rubocop_todo/gitlab/delegate_predicate_methods.yml index 90f64e0d2e74ab63b940eef287b72adae7335aef..408eb6b6860b8a13946164bb0a26c22425cbe166 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 e3c84092e2680aa7ce65141b10ce728e6e78b0ba..309c5a017480f36b22de6978aa44ef538861b45c 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)