summaryrefslogtreecommitdiff
path: root/app/models/ability.rb
diff options
context:
space:
mode:
authorDavid Alexander <davidpaulalexander@gmail.com>2016-03-14 09:13:35 -0400
committerRémy Coutable <remy@rymai.me>2016-06-14 12:12:02 +0200
commit17c22156c5fa5663aae65178ed38cbeef9a80b7e (patch)
tree5bd90d34c7360c892f6ea57dd1d3e4a6350a51cd /app/models/ability.rb
parent0c0ef7dfb6afb1695b62037fc0fa5aba6ce697d7 (diff)
downloadgitlab-ce-17c22156c5fa5663aae65178ed38cbeef9a80b7e.tar.gz
Initial implementation of user access request to projects
Diffstat (limited to 'app/models/ability.rb')
-rw-r--r--app/models/ability.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index aea946f9224..b3db26f989e 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -153,7 +153,7 @@ class Ability
RequestStore.store[key] ||= begin
# Push abilities on the users team role
- rules.push(*project_team_rules(project.team, user))
+ rules.push(*project_team_rules(project.team, user)) unless project.team.pending?(user)
if project.owner == user ||
(project.group && project.group.has_owner?(user)) ||