diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/workers/update_highest_role_worker.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
download | gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/workers/update_highest_role_worker.rb')
-rw-r--r-- | app/workers/update_highest_role_worker.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/workers/update_highest_role_worker.rb b/app/workers/update_highest_role_worker.rb index d5df46c172b..064b8203d4d 100644 --- a/app/workers/update_highest_role_worker.rb +++ b/app/workers/update_highest_role_worker.rb @@ -13,17 +13,15 @@ class UpdateHighestRoleWorker idempotent! - # rubocop: disable CodeReuse/ActiveRecord def perform(user_id) - user = User.find_by(id: user_id) + user = User.find_by_id(user_id) return unless user.present? if user.active? && user.human? && !user.internal? Users::UpdateHighestMemberRoleService.new(user).execute else - UserHighestRole.where(user_id: user_id).delete_all + UserHighestRole.where(user_id: user_id).delete_all # rubocop: disable CodeReuse/ActiveRecord end end - # rubocop: enable CodeReuse/ActiveRecord end |