summaryrefslogtreecommitdiff
path: root/app/views/layouts/nav/_project.html.haml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-27 16:20:57 +0200
committerRémy Coutable <remy@rymai.me>2016-07-01 17:44:46 +0200
commitbd78f5733ca546bf940438b84aefa2fa3abacb36 (patch)
tree9d9ac648a594623489e628e025bde48f7ef2b2f9 /app/views/layouts/nav/_project.html.haml
parent557ca2b31ff503b36a4b65af2641fcd0f5682d5b (diff)
downloadgitlab-ce-bd78f5733ca546bf940438b84aefa2fa3abacb36.tar.gz
Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scope
And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/layouts/nav/_project.html.haml')
-rw-r--r--app/views/layouts/nav/_project.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index dcef427cda3..9e65d94186b 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -7,7 +7,7 @@
%ul.dropdown-menu.dropdown-menu-align-right
- can_edit = can?(current_user, :admin_project, @project)
-# We don't use @project.team.find_member because it searches for group members too...
- - member = @project.members.non_request.find_by(user_id: current_user.id)
+ - member = @project.members.find_by(user_id: current_user.id)
- can_leave = member && can?(current_user, :destroy_project_member, member)
= render 'layouts/nav/project_settings', can_edit: can_edit