Commit 206e057a authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch '300321_fix_billable_user_count_for_trial_ultimate_license' into 'master'

Exclude guests for trial ultimate licenses too

See merge request gitlab-org/gitlab!54952
parents 26421380 857d75a5
......@@ -157,10 +157,7 @@ module EE
def billable
scope = active.without_bots
License.with_valid_license do |license|
scope = scope.excluding_guests if license.exclude_guests_from_active_count?
end
scope = scope.excluding_guests if License.current&.exclude_guests_from_active_count?
scope
end
......
---
title: Exclude guests for trial ultimate licenses too
merge_request: 54952
author:
type: fixed
......@@ -642,7 +642,7 @@ RSpec.describe User do
context 'without guests' do
before do
license = double('License', exclude_guests_from_active_count?: true, trial?: false)
license = double('License', exclude_guests_from_active_count?: true)
allow(License).to receive(:current) { license }
end
......
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