|
|
|
@ -9,6 +9,6 @@ class ProcessMergeRequestJob < ApplicationJob |
|
|
|
Merge::MergeOrganisationsService.new(absorbing_organisation_id:, merging_organisation_ids:, merge_date:).call |
|
|
|
Merge::MergeOrganisationsService.new(absorbing_organisation_id:, merging_organisation_ids:, merge_date:).call |
|
|
|
merge_request.update!(request_merged: true, last_failed_attempt: nil) |
|
|
|
merge_request.update!(request_merged: true, last_failed_attempt: nil) |
|
|
|
rescue StandardError |
|
|
|
rescue StandardError |
|
|
|
merge_request.update!(last_failed_attempt: Time.zone.now) |
|
|
|
merge_request.update!(last_failed_attempt: Time.zone.now, processing: false) |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
|