Merge branch 'jivl-fix-group-members-information' into 'master'
Fix group member information not collapsing in a single line Closes #47448 See merge request gitlab-org/gitlab-ce!19508
This commit is contained in:
commit
881d980afa
2 changed files with 10 additions and 10 deletions
|
@ -3,5 +3,5 @@
|
|||
Groups with access to
|
||||
%strong= @project.name
|
||||
%span.badge.badge-pill= group_links.size
|
||||
%ul.content-list
|
||||
%ul.content-list.members-list
|
||||
= render partial: 'shared/members/group', collection: group_links, as: :group_link
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
%li.member.group_member{ id: dom_id }
|
||||
%span.list-item-name
|
||||
= group_icon(group, class: "avatar s40", alt: '')
|
||||
%strong
|
||||
= link_to group.full_name, group_path(group)
|
||||
.cgray
|
||||
Given access #{time_ago_with_tooltip(group_link.created_at)}
|
||||
- if group_link.expires?
|
||||
·
|
||||
%span{ class: ('text-warning' if group_link.expires_soon?) }
|
||||
Expires in #{distance_of_time_in_words_to_now(group_link.expires_at)}
|
||||
.user-info
|
||||
= link_to group.full_name, group_path(group), class: 'member'
|
||||
.cgray
|
||||
Given access #{time_ago_with_tooltip(group_link.created_at)}
|
||||
- if group_link.expires?
|
||||
·
|
||||
%span{ class: ('text-warning' if group_link.expires_soon?) }
|
||||
Expires in #{distance_of_time_in_words_to_now(group_link.expires_at)}
|
||||
.controls.member-controls
|
||||
= form_tag project_group_link_path(@project, group_link), method: :put, remote: true, class: 'js-edit-member-form' do
|
||||
= form_tag project_group_link_path(@project, group_link), method: :put, remote: true, class: 'js-edit-member-form form-group row append-right-5' do
|
||||
= hidden_field_tag "group_link[group_access]", group_link.group_access
|
||||
.member-form-control.dropdown.append-right-5
|
||||
%button.dropdown-menu-toggle.js-member-permissions-dropdown{ type: "button",
|
||||
|
|
Loading…
Reference in a new issue