From 3790cb1fe774579c09b37005b7955120b610a865 Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Sun, 15 Apr 2018 22:04:06 +0200
Subject: Change Referential.new_from invocation in Merge#prepare_new. Refs
 #6535

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

(limited to 'app')

diff --git a/app/models/merge.rb b/app/models/merge.rb
index 6e2a7036a..a608f9935 100644
--- a/app/models/merge.rb
+++ b/app/models/merge.rb
@@ -50,7 +50,7 @@ class Merge < ApplicationModel
     new =
       if workbench.output.current
         Rails.logger.debug "Clone current output"
-        Referential.new_from(workbench.output.current, fixme_functional_scope).tap do |clone|
+        Referential.new_from(workbench.output.current, workbench.organisation).tap do |clone|
           clone.inline_clone = true
         end
       else
-- 
cgit v1.2.3