diff options
| author | cedricnjanga | 2018-04-16 22:29:17 -0700 |
|---|---|---|
| committer | cedricnjanga | 2018-04-16 22:29:17 -0700 |
| commit | e91e12ddeb5af8d183c618d5925146a42ab0922f (patch) | |
| tree | 82125a6b25f1022f940ac1492839135cae02815b /app/controllers | |
| parent | de6edec5a85e2282f11b1eed0bd97fb5b6eaafe8 (diff) | |
| download | chouette-core-e91e12ddeb5af8d183c618d5925146a42ab0922f.tar.bz2 | |
Refs #6476 Add merge permissions6476-merge-permissions
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 |