diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/workers/ssh_keys/expired_notification_worker.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/workers/ssh_keys/expired_notification_worker.rb')
-rw-r--r-- | app/workers/ssh_keys/expired_notification_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/ssh_keys/expired_notification_worker.rb b/app/workers/ssh_keys/expired_notification_worker.rb index d8553b5a9a2..dc1efce51ce 100644 --- a/app/workers/ssh_keys/expired_notification_worker.rb +++ b/app/workers/ssh_keys/expired_notification_worker.rb @@ -29,7 +29,7 @@ module SshKeys ) ]) - scope = Key.expired_and_not_notified.order(order) + scope = Key.expired_today_and_not_notified.order(order) iterator = Gitlab::Pagination::Keyset::Iterator.new(scope: scope, use_union_optimization: true) iterator.each_batch(of: BATCH_SIZE) do |relation| @@ -37,7 +37,7 @@ module SshKeys users.each do |user| with_context(user: user) do - Keys::ExpiryNotificationService.new(user, { keys: user.expired_and_unnotified_keys, expiring_soon: false }).execute + Keys::ExpiryNotificationService.new(user, { keys: user.expired_today_and_unnotified_keys, expiring_soon: false }).execute end end end |