diff options
| author | Luc Donnet | 2018-04-18 14:33:02 +0200 |
|---|---|---|
| committer | GitHub | 2018-04-18 14:33:02 +0200 |
| commit | afab5aa87cee66e27d99a29c12c735edba5629ae (patch) | |
| tree | c599bdcff445834935f696dee3e7a6d2c725e978 /app/controllers | |
| parent | 7193ae93019eec54121db3150cab9fa200424785 (diff) | |
| parent | e91e12ddeb5af8d183c618d5925146a42ab0922f (diff) | |
| download | chouette-core-afab5aa87cee66e27d99a29c12c735edba5629ae.tar.bz2 | |
Merge pull request #489 from af83/6476-merge-permissions
Refs #6476 Add 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 |