diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 00:08:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 00:08:31 +0300 |
commit | e7bc93852d0ce48c490a780b6a1adc6cc36dd342 (patch) | |
tree | b07651f4700e8ec2338298b4d224b6252b505eef /app/models/concerns/update_highest_role.rb | |
parent | 34e72e54129090eaae6e045890fcdf8b5ad3f629 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/update_highest_role.rb')
-rw-r--r-- | app/models/concerns/update_highest_role.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/concerns/update_highest_role.rb b/app/models/concerns/update_highest_role.rb index 7efc436c6c8..6432cc794a5 100644 --- a/app/models/concerns/update_highest_role.rb +++ b/app/models/concerns/update_highest_role.rb @@ -29,9 +29,7 @@ module UpdateHighestRole UpdateHighestRoleWorker.perform_in(HIGHEST_ROLE_JOB_DELAY, update_highest_role_attribute) else # use same logging as ExclusiveLeaseGuard - # rubocop:disable Gitlab/RailsLogger - Rails.logger.error('Cannot obtain an exclusive lease. There must be another instance already in execution.') - # rubocop:enable Gitlab/RailsLogger + Gitlab::AppLogger.error('Cannot obtain an exclusive lease. There must be another instance already in execution.') end end end |