From 0046e5a01cb08c10118b01c50f3c52d159854ef0 Mon Sep 17 00:00:00 2001
From: Zog
Date: Wed, 18 Apr 2018 09:59:15 +0200
Subject: Refs #6572; Use new states

---
 app/models/merge.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/models/merge.rb')

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
 
-- 
cgit v1.2.3