diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/services/concerns | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/services/concerns')
| -rw-r--r-- | app/services/concerns/exclusive_lease_guard.rb | 2 | ||||
| -rw-r--r-- | app/services/concerns/incident_management/settings.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/services/concerns/exclusive_lease_guard.rb b/app/services/concerns/exclusive_lease_guard.rb index 4678d051d29..a58e9aefcec 100644 --- a/app/services/concerns/exclusive_lease_guard.rb +++ b/app/services/concerns/exclusive_lease_guard.rb @@ -21,7 +21,7 @@ module ExclusiveLeaseGuard lease = exclusive_lease.try_obtain unless lease - log_error('Cannot obtain an exclusive lease. There must be another instance already in execution.') + log_error("Cannot obtain an exclusive lease for #{self.class.name}. There must be another instance already in execution.") return end diff --git a/app/services/concerns/incident_management/settings.rb b/app/services/concerns/incident_management/settings.rb index 5f56d6e7f53..491bd4fa6bf 100644 --- a/app/services/concerns/incident_management/settings.rb +++ b/app/services/concerns/incident_management/settings.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true module IncidentManagement module Settings + include Gitlab::Utils::StrongMemoize + def incident_management_setting strong_memoize(:incident_management_setting) do project.incident_management_setting || |