diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-07 19:45:27 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-07 19:45:27 +0000 |
| commit | 881d980afac9797d6ec92262bb459f1b93d0d03c (patch) | |
| tree | c750fb3a7aded17ddf6022506a80581636eee10c | |
| parent | 38645a34f4f166c20033bb544a992c76eaf10edc (diff) | |
| parent | 8374d5a9c6923d1660e60e3a6d15be1ed1b69d12 (diff) | |
| download | gitlab-ce-881d980afac9797d6ec92262bb459f1b93d0d03c.tar.gz | |
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
| -rw-r--r-- | app/views/projects/project_members/_groups.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/members/_group.html.haml | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/views/projects/project_members/_groups.html.haml b/app/views/projects/project_members/_groups.html.haml index 128f52ff648..3f05e06b0c6 100644 --- a/app/views/projects/project_members/_groups.html.haml +++ b/app/views/projects/project_members/_groups.html.haml @@ -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 diff --git a/app/views/shared/members/_group.html.haml b/app/views/shared/members/_group.html.haml index 67b8843a27f..d0b492b43f3 100644 --- a/app/views/shared/members/_group.html.haml +++ b/app/views/shared/members/_group.html.haml @@ -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", |