diff options
| author | Alban Peignier | 2017-12-26 22:00:56 +0100 |
|---|---|---|
| committer | Alban Peignier | 2018-01-05 10:23:29 +0100 |
| commit | 5c020964b4413bb3336bf42769d65c71b0fe5bd5 (patch) | |
| tree | 40a87fe6d5a10c306bb751b3034412ab84b2de20 /app/controllers/merges_controller.rb | |
| parent | 9f8a27542d235314143f69de3c101be3f04b66d1 (diff) | |
| download | chouette-core-5c020964b4413bb3336bf42769d65c71b0fe5bd5.tar.bz2 | |
Ignore referential in referential suite for mergeable referentials. Refs #5299
Diffstat (limited to 'app/controllers/merges_controller.rb')
| -rw-r--r-- | app/controllers/merges_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |