diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-06-14 16:23:16 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-06-14 16:23:16 +0200 |
| commit | 9413d1c2e9c4cebe32921f6e403cf496e3ec8c58 (patch) | |
| tree | ac829f9a9bb88f4e6ca36ef071005ea5c2088336 /app/views/layouts/nav/_project.html.haml | |
| parent | 515205d3c1c6655302ed0ae44cc5954dead7ae79 (diff) | |
| parent | d4cd6dcaa024f8eca9089e67fb9b97022696d3e0 (diff) | |
| download | gitlab-ce-9413d1c2e9c4cebe32921f6e403cf496e3ec8c58.tar.gz | |
Merge branch 'master' into 13948-access-request-to-projects-and-groups
# Conflicts:
# app/views/layouts/nav/_project.html.haml
Diffstat (limited to 'app/views/layouts/nav/_project.html.haml')
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index ad019710830..718acb424b2 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -5,10 +5,11 @@ = icon('cog') = icon('caret-down') %ul.dropdown-menu.dropdown-menu-align-right - = render 'layouts/nav/project_settings' - - access = @project.team.max_member_access(current_user.id) - can_edit = can?(current_user, :admin_project, @project) + + = render 'layouts/nav/project_settings', access: access, can_edit: can_edit + - if can_edit || access %li.divider - if can_edit @@ -18,7 +19,7 @@ - if access %li = link_to polymorphic_path([:leave, @project, :members]), - data: { confirm: leave_confirmation_message(@project) }, method: :delete do + data: { confirm: leave_confirmation_message(@project) }, method: :delete, title: 'Leave project' do Leave Project %div{ class: nav_control_class } |