diff options
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 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 |