summaryrefslogtreecommitdiff
path: root/app/models/ability.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-05-25 10:42:41 -0400
committerStan Hu <stanhu@gmail.com>2015-05-25 16:51:04 -0700
commit9bcd36396b9b71467f66dd4ed79ab709bb5d027a (patch)
tree39d444294c96393beaccdd8dc0acebb4c62a6541 /app/models/ability.rb
parentbdf7b44ac36809383431d439c343b313fc7b1d90 (diff)
downloadgitlab-ce-9bcd36396b9b71467f66dd4ed79ab709bb5d027a.tar.gz
Refactor permission checks to use `can?` instead of `issues_enabled` and `merge_requests_enabled`
Diffstat (limited to 'app/models/ability.rb')
-rw-r--r--app/models/ability.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 04d9dccf916..e166b4197fd 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -109,6 +109,11 @@ class Ability
rules -= named_abilities('merge_request')
end
+ unless project.issues_enabled or project.merge_requests_enabled
+ rules -= named_abilities('label')
+ rules -= named_abilities('milestone')
+ end
+
unless project.snippets_enabled
rules -= named_abilities('snippet')
end