From 5c020964b4413bb3336bf42769d65c71b0fe5bd5 Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Tue, 26 Dec 2017 22:00:56 +0100
Subject: Ignore referential in referential suite for mergeable referentials.
 Refs #5299

---
 app/controllers/merges_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/merges_controller.rb')

diff --git a/app/controllers/merges_controller.rb b/app/controllers/merges_controller.rb
index 867bf1e6a..f9841fbf6 100644
--- a/app/controllers/merges_controller.rb
+++ b/app/controllers/merges_controller.rb
@@ -11,7 +11,7 @@ class MergesController < ChouetteController
   private
 
   def set_mergeable_controllers
-    @mergeable_referentials ||= parent.referentials
+    @mergeable_referentials ||= parent.referentials.ready.not_in_referential_suite
     Rails.logger.debug "Mergeables: #{@mergeable_referentials.inspect}"
   end
 
-- 
cgit v1.2.3