summaryrefslogtreecommitdiff
path: root/app/models/ability.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-20 12:34:29 +0200
committerRémy Coutable <remy@rymai.me>2016-07-20 14:38:21 +0200
commit5fb436aaa4b9b597a1c9e995ecd13ee2a76aaedf (patch)
tree41c0ad716217ba0ad3939e619ac093adef7db558 /app/models/ability.rb
parent4d69cb9d9460f9805bfc1f34ca3a600f54804167 (diff)
downloadgitlab-ce-5fb436aaa4b9b597a1c9e995ecd13ee2a76aaedf.tar.gz
Fix a few nitpicks
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/ability.rb')
-rw-r--r--app/models/ability.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index e6c186c6910..f33c8d61d3f 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -372,8 +372,8 @@ class Ability
]
end
- if (group.public? || (group.internal? && !user.external?)) && group.request_access_enabled
- rules << :request_access unless group.users.include?(user)
+ if group.public? || (group.internal? && !user.external?)
+ rules << :request_access if group.request_access_enabled && group.users.exclude?(user)
end
rules.flatten