From cc4f4a0abff3eeef4af6091180777bf3a0de6746 Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Thu, 17 May 2018 13:48:58 +0200
Subject: Invoke CleanUp when merge is down. Refs #7070

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

(limited to 'app')

diff --git a/app/models/merge.rb b/app/models/merge.rb
index aca2f4d4d..f4111c3fa 100644
--- a/app/models/merge.rb
+++ b/app/models/merge.rb
@@ -35,6 +35,8 @@ class Merge < ApplicationModel
       merge_referential referential
     end
 
+    clean_new
+
     save_current
   rescue => e
     Rails.logger.error "Merge failed: #{e} #{e.backtrace.join("\n")}"
@@ -83,6 +85,10 @@ class Merge < ApplicationModel
     @new = new
   end
 
+  def clean_new
+    CleanUp.new(referential: new, methods: [:destroy_empty]).clean
+  end
+
   def merge_referential(referential)
     Rails.logger.debug "Merge #{referential.slug}"
 
-- 
cgit v1.2.3