aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-01-05 14:02:03 +0100
committerAlban Peignier2018-01-05 14:02:03 +0100
commit2c2d6b24e5f163a558feda940aa632d0e8c08d3f (patch)
treea9debc8731ebf35155be5df940661cccb6993fc4
parent43541cf4d0a461ac76bec4ea9ae16163a105f76a (diff)
downloadchouette-core-2c2d6b24e5f163a558feda940aa632d0e8c08d3f.tar.bz2
Disable PolicyChecker in MergesController. Refs #5299
-rw-r--r--app/controllers/merges_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/merges_controller.rb b/app/controllers/merges_controller.rb
index f9841fbf6..26e2c2e3c 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