diff options
| author | Alban Peignier | 2018-01-11 21:43:22 +0100 |
|---|---|---|
| committer | Alban Peignier | 2018-01-11 22:03:34 +0100 |
| commit | 13de613c6db20e32f58ca16b5b3c58e79b5e8d70 (patch) | |
| tree | 99334c94543e6d7f13301b175dd3de48352a47fc /app/controllers | |
| parent | 1fd6d7d0cfb63b024860d1c29fca089432fce2e1 (diff) | |
| download | chouette-core-13de613c6db20e32f58ca16b5b3c58e79b5e8d70.tar.bz2 | |
Add Referential#merged_at and make Referentials archived and merged. Refs #5559
Diffstat (limited to 'app/controllers')
| -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 a95768139..1ce64ed58 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.ready.not_in_referential_suite + @mergeable_referentials ||= parent.referentials.mergeable Rails.logger.debug "Mergeables: #{@mergeable_referentials.inspect}" end |