From e91e12ddeb5af8d183c618d5925146a42ab0922f Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Mon, 16 Apr 2018 22:29:17 -0700
Subject: Refs #6476 Add merge permissions

---
 app/controllers/merges_controller.rb | 2 +-
 app/policies/merge_policy.rb         | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'app')

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
diff --git a/app/policies/merge_policy.rb b/app/policies/merge_policy.rb
index 82eb72e08..154dc63f5 100644
--- a/app/policies/merge_policy.rb
+++ b/app/policies/merge_policy.rb
@@ -8,8 +8,4 @@ class MergePolicy < ApplicationPolicy
   def create?
     user.has_permission?('merges.create')
   end
-
-  def update?
-    user.has_permission?('merges.update')
-  end
 end
-- 
cgit v1.2.3