Commit 881d980a authored by Annabel Gray's avatar Annabel Gray

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
parents 38645a34 8374d5a9
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
Groups with access to Groups with access to
%strong= @project.name %strong= @project.name
%span.badge.badge-pill= group_links.size %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 = render partial: 'shared/members/group', collection: group_links, as: :group_link
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
%li.member.group_member{ id: dom_id } %li.member.group_member{ id: dom_id }
%span.list-item-name %span.list-item-name
= group_icon(group, class: "avatar s40", alt: '') = group_icon(group, class: "avatar s40", alt: '')
%strong .user-info
= link_to group.full_name, group_path(group) = link_to group.full_name, group_path(group), class: 'member'
.cgray .cgray
Given access #{time_ago_with_tooltip(group_link.created_at)} Given access #{time_ago_with_tooltip(group_link.created_at)}
- if group_link.expires? - if group_link.expires?
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
%span{ class: ('text-warning' if group_link.expires_soon?) } %span{ class: ('text-warning' if group_link.expires_soon?) }
Expires in #{distance_of_time_in_words_to_now(group_link.expires_at)} Expires in #{distance_of_time_in_words_to_now(group_link.expires_at)}
.controls.member-controls .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 = hidden_field_tag "group_link[group_access]", group_link.group_access
.member-form-control.dropdown.append-right-5 .member-form-control.dropdown.append-right-5
%button.dropdown-menu-toggle.js-member-permissions-dropdown{ type: "button", %button.dropdown-menu-toggle.js-member-permissions-dropdown{ type: "button",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment