diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-04 14:56:27 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-04 14:56:27 +0100 |
| commit | ccca73d779ae0e22a86c9586fd52b15a8600b9f3 (patch) | |
| tree | 7385d9a2019bfa98affe9bc83c0afd7da2fd730d /app/views/shared/members/_member.html.haml | |
| parent | c252c03401881fd7dbf7fab984285c402eb31d5f (diff) | |
| parent | 5f7ebfb9aa023849b8b296bf9cf0f472b886d072 (diff) | |
| download | gitlab-ce-ccca73d779ae0e22a86c9586fd52b15a8600b9f3.tar.gz | |
Merge branch 'master' into add-sentry-js-again-with-vue
Diffstat (limited to 'app/views/shared/members/_member.html.haml')
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 659d4c905fc..a5aa768b1b2 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -19,9 +19,9 @@ %label.label.label-danger %strong Blocked - - if source.instance_of?(Group) && !@group + - if source.instance_of?(Group) && source != @group · - = link_to source.name, source, class: "member-group-link" + = link_to source.full_name, source, class: "member-group-link" .hidden-xs.cgray - if member.request? @@ -31,7 +31,7 @@ Joined #{time_ago_with_tooltip(member.created_at)} - if member.expires? ยท - %span{ class: ('text-warning' if member.expires_soon?) } + %span{ class: "#{"text-warning" if member.expires_soon?} has-tooltip", title: member.expires_at.to_time.in_time_zone.to_s(:medium) } Expires in #{distance_of_time_in_words_to_now(member.expires_at)} - else @@ -44,9 +44,10 @@ = link_to member.created_by.name, user_path(member.created_by) = time_ago_with_tooltip(member.created_at) - if show_roles + - current_resource = @project || @group .controls.member-controls - - if show_controls && (member.respond_to?(:group) && @group) || (member.respond_to?(:project) && @project) - - if user != current_user + - if show_controls && member.source == current_resource + - if user != current_user && can_admin_member = form_for member, remote: true, html: { class: 'form-horizontal js-edit-member-form' } do |f| = f.hidden_field :access_level .member-form-control.dropdown.append-right-5 @@ -60,7 +61,7 @@ = dropdown_title("Change permissions") .dropdown-content %ul - - Gitlab::Access.options.each do |role, role_id| + - member.class.access_level_roles.each do |role, role_id| %li = link_to role, "javascript:void(0)", class: ("is-active" if member.access_level == role_id), |