diff options
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 1ce64ed58..663b6e750 100644 --- a/app/controllers/merges_controller.rb +++ b/app/controllers/merges_controller.rb @@ -1,5 +1,5 @@  class MergesController < ChouetteController -  # include PolicyChecker +  include PolicyChecker    defaults resource_class: Merge    belongs_to :workbench | 
