diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
| commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
| tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /app/services/web_hooks | |
| parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) | |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'app/services/web_hooks')
| -rw-r--r-- | app/services/web_hooks/destroy_service.rb | 3 | ||||
| -rw-r--r-- | app/services/web_hooks/log_execution_service.rb | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/services/web_hooks/destroy_service.rb b/app/services/web_hooks/destroy_service.rb index ecb530f0d2a..54c6c7ea71b 100644 --- a/app/services/web_hooks/destroy_service.rb +++ b/app/services/web_hooks/destroy_service.rb @@ -21,8 +21,5 @@ module WebHooks ServiceResponse.error(message: "Unable to destroy #{web_hook.model_name.human}") end end - - # Backwards compatibility with WebHooks::DestroyWorker - alias_method :sync_destroy, :execute end end diff --git a/app/services/web_hooks/log_execution_service.rb b/app/services/web_hooks/log_execution_service.rb index 0ee7c41469f..17dcf615830 100644 --- a/app/services/web_hooks/log_execution_service.rb +++ b/app/services/web_hooks/log_execution_service.rb @@ -44,6 +44,7 @@ module WebHooks end log_state_change + hook.update_last_failure end rescue Gitlab::ExclusiveLeaseHelpers::FailedToObtainLockError raise if raise_lock_error? |