summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-06-13 08:01:46 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-06-13 08:01:46 -0600
commit63900c1dcfa477ab573e7fd57d8b3e5cc2ecf6cf (patch)
tree0ae4af2de890df513c0e69a59035e74879b6487f
parent358404687fd4981a57d434f0edaa36336d2befd4 (diff)
downloadgitlab-ce-63900c1dcfa477ab573e7fd57d8b3e5cc2ecf6cf.tar.gz
Pass can_edit and access to partial.
-rw-r--r--app/views/layouts/nav/_project.html.haml2
-rw-r--r--app/views/layouts/nav/_project_settings.html.haml2
2 files changed, 1 insertions, 3 deletions
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index cc2825932d9..155fd1792ce 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -7,7 +7,7 @@
= icon('cog')
= icon('caret-down')
%ul.dropdown-menu.dropdown-menu-align-right
- = render 'layouts/nav/project_settings'
+ = render 'layouts/nav/project_settings', access: access, can_edit: can_edit
- if can_edit || access
%li.divider
- if can_edit
diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index d26f89bdf17..13d32bd1354 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -1,5 +1,3 @@
-- access = user_max_access_in_project(current_user.id, @project)
-- can_edit = can?(current_user, :admin_project, @project)
- if project_nav_tab? :team
= nav_link(controller: [:project_members, :teams]) do
= link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab' do