From 18fd2ccb8b9b60e2acd6782a4160f85d3ee6c95f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 15 Jun 2016 12:12:26 +0200
Subject: [PATCH] Improve cyclomatic of ability::allowed

---
 app/models/ability.rb | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 734b152605b..8d76e8efa13 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -9,7 +9,6 @@ class Ability
       when CommitStatus then commit_status_abilities(user, subject)
       when Project then project_abilities(user, subject)
       when Issue then issue_abilities(user, subject)
-      when ExternalIssue then external_issue_abilities(user, subject)
       when Note then note_abilities(user, subject)
       when ProjectSnippet then project_snippet_abilities(user, subject)
       when PersonalSnippet then personal_snippet_abilities(user, subject)
@@ -18,9 +17,8 @@ class Ability
       when Namespace then namespace_abilities(user, subject)
       when GroupMember then group_member_abilities(user, subject)
       when ProjectMember then project_member_abilities(user, subject)
-      when Deployment then deployment_abilities(user, subject)
-      when Environment then environment_abilities(user, subject)
       when User then user_abilities
+      when ExternalIssue, Deployment, Environment then project_abilities(user, subject.project)
       else []
       end.concat(global_abilities(user))
     end
@@ -523,18 +521,6 @@ class Ability
       end
     end
 
-    def external_issue_abilities(user, subject)
-      project_abilities(user, subject.project)
-    end
-
-    def deployment_abilities(user, subject)
-      project_abilities(user, subject.project)
-    end
-
-    def environment_abilities(user, subject)
-      project_abilities(user, subject.project)
-    end
-
     private
 
     def restricted_public_level?
-- 
GitLab