diff options
Diffstat (limited to 'app/models/merge.rb')
| -rw-r--r-- | app/models/merge.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb index be1bbedcb..2824e1f83 100644 --- a/app/models/merge.rb +++ b/app/models/merge.rb @@ -39,10 +39,14 @@ class Merge < ApplicationModel rescue => e Rails.logger.error "Merge failed: #{e} #{e.backtrace.join("\n")}" update status: :failed + new&.failed! raise e if Rails.env.test? ensure attributes = { ended_at: Time.now } - attributes[:status] = :successful if status == :running + if status == :running + attributes[:status] = :successful + referentials.each &:archived! + end update attributes end |