diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-08 14:45:39 +0000 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-12-13 14:54:05 -0300 |
| commit | 5d793da1775fd9914b36b6f85d18e2cf5a88095c (patch) | |
| tree | dceedd277b340b62dd5e3fcf5c81e56ced0fb685 /app/views | |
| parent | 06a0a5d72bba61d0e23a465b78d2c0ca72d89b78 (diff) | |
| download | gitlab-ce-5d793da1775fd9914b36b6f85d18e2cf5a88095c.tar.gz | |
Merge branch 'group-members-in-project-members-view' into 'master'
Shows group members in the project members list
Closes #24122
See merge request !7899
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 432047a1c4e..e67f7d5a352 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -20,8 +20,8 @@ %strong Blocked - if source.instance_of?(Group) && !@group - = link_to source, class: "member-group-link prepend-left-5" do - = "· #{source.name}" + · + = link_to source.name, source, class: "member-group-link" .hidden-xs.cgray - if member.request? @@ -45,7 +45,7 @@ = time_ago_with_tooltip(member.created_at) - if show_roles .controls.member-controls - - if show_controls + - if show_controls && (member.respond_to?(:group) && @group) || (member.respond_to?(:project) && @project) - if user != current_user = form_for member, remote: true, html: { class: 'form-horizontal js-edit-member-form' } do |f| = f.select :access_level, options_for_select(member.class.access_level_roles, member.access_level), {}, class: 'form-control member-form-control append-right-5 js-member-update-control', id: "member_access_level_#{member.id}", disabled: !can_admin_member |