Commit 81d8c0ff authored by Stan Hu's avatar Stan Hu

Merge branch 'remove_active_method_for_license' into 'master'

Remove #active? from License model

See merge request gitlab-org/gitlab!30510
parents 3fe2aa22 ba26e370
......@@ -419,10 +419,6 @@ class License < ApplicationRecord
restricted_attr(:trial)
end
def active?
!expired?
end
def exclude_guests_from_active_count?
plan == License::ULTIMATE_PLAN
end
......
......@@ -42,7 +42,7 @@
Expired:
- else
Expires:
- if @license.will_expire? && @license.active?
- if @license.will_expire? && !@license.expired?
- if @license.trial?
%strong.has-tooltip{ title: @license.expires_at.to_formatted_s(:long), data: { placement: 'top' } }
Free trial will expire in #{pluralize(@license.remaining_days, 'day')}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment