diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-13 15:17:04 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-05-14 16:30:58 +0000 |
| commit | 3a06e0ea5e5c2d9630bd043c94b95e5055737de3 (patch) | |
| tree | 4edba390d306bb870480f7f4380e1ee8b3e8b089 | |
| parent | b92d752e4483873684dfd92a720610867da2dbfc (diff) | |
| download | gitlab-ce-3a06e0ea5e5c2d9630bd043c94b95e5055737de3.tar.gz | |
Merge branch 'ce-11542-remove-non-semantic-use-of-row-in-member-listing-controls' into 'master'
CE backport: Remove non-semantic use of `.row` in member listing controls
See merge request gitlab-org/gitlab-ce!28204
(cherry picked from commit 505ffe56576caf67bedcb20d86a8c8a3e8e4c4b3)
9674ed71 Remove non-semantic use of `.row` in member listing controls
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/ce-11542-remove-non-semantic-use-of-row-in-member-listing-controls.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 2e5747121b6..2db1f67a793 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -53,7 +53,7 @@ = time_ago_with_tooltip(member.created_at) - if show_roles - current_resource = @project || @group - .controls.member-controls.row + .controls.member-controls - if show_controls && member.source == current_resource - if member.can_resend_invite? diff --git a/changelogs/unreleased/ce-11542-remove-non-semantic-use-of-row-in-member-listing-controls.yml b/changelogs/unreleased/ce-11542-remove-non-semantic-use-of-row-in-member-listing-controls.yml new file mode 100644 index 00000000000..c2dcd309abd --- /dev/null +++ b/changelogs/unreleased/ce-11542-remove-non-semantic-use-of-row-in-member-listing-controls.yml @@ -0,0 +1,5 @@ +--- +title: Remove non-semantic use of `.row` in member listing controls +merge_request: 28204 +author: +type: fixed |