diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /app/services/auto_merge/base_service.rb | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
| download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/services/auto_merge/base_service.rb')
| -rw-r--r-- | app/services/auto_merge/base_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/auto_merge/base_service.rb b/app/services/auto_merge/base_service.rb index 41236286d23..142eebca2e3 100644 --- a/app/services/auto_merge/base_service.rb +++ b/app/services/auto_merge/base_service.rb @@ -15,7 +15,7 @@ module AutoMerge AutoMergeProcessWorker.perform_async(merge_request.id) strategy.to_sym - rescue => e + rescue StandardError => e track_exception(e, merge_request) :failed end @@ -35,7 +35,7 @@ module AutoMerge end success - rescue => e + rescue StandardError => e track_exception(e, merge_request) error("Can't cancel the automatic merge", 406) end @@ -47,7 +47,7 @@ module AutoMerge end success - rescue => e + rescue StandardError => e track_exception(e, merge_request) error("Can't abort the automatic merge", 406) end |