Commit 2ffe7814 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch '326931-2-outside-active-period' into 'master'

Allow seat link when outside license period

See merge request gitlab-org/gitlab!59727
parents f31bea1c 73a21e2e
...@@ -31,8 +31,7 @@ module Gitlab ...@@ -31,8 +31,7 @@ module Gitlab
if license.cloud? if license.cloud?
!license.trial? && !license.trial? &&
license.expires_at && # Skip sync if license has no expiration license.expires_at.present? # Skip sync if license has no expiration
timestamp.between?(license.starts_at.beginning_of_day, license.expires_at.end_of_day + 14.days)
else else
# Only sync paid licenses from start date until 14 days after expiration # Only sync paid licenses from start date until 14 days after expiration
# when seat link feature is enabled. # when seat link feature is enabled.
......
...@@ -154,7 +154,7 @@ RSpec.describe Gitlab::SeatLinkData do ...@@ -154,7 +154,7 @@ RSpec.describe Gitlab::SeatLinkData do
context 'when timestamp is out of the range' do context 'when timestamp is out of the range' do
let(:timestamp) { license.starts_at - 1.day } let(:timestamp) { license.starts_at - 1.day }
it { is_expected.to be_falsey } it { is_expected.to eq(true) }
end end
context 'when historical data not found' do context 'when historical data not found' do
......
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