From 2380c3c567edae80b9b76bdbc5cff658610a2e78 Mon Sep 17 00:00:00 2001 From: Samuel Date: Mon, 16 Jun 2025 15:44:20 +0100 Subject: [PATCH] no longer raise a rollback on merge fail this caused the error to not be bubbled up correctly, meaning the catch in process_merge_request_job was not being triggered, and so not setting the merge back to ready raising any exception will trigger a rollback --- app/services/merge/merge_organisations_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/merge/merge_organisations_service.rb b/app/services/merge/merge_organisations_service.rb index 40749b54c..c831c875f 100644 --- a/app/services/merge/merge_organisations_service.rb +++ b/app/services/merge/merge_organisations_service.rb @@ -26,7 +26,7 @@ class Merge::MergeOrganisationsService log_success_message rescue ActiveRecord::RecordInvalid => e Rails.logger.error("Organisation merge failed with: #{e.message}") - raise ActiveRecord::Rollback + raise end end