diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-25 21:35:14 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-25 21:35:14 +0000 |
| commit | 2d93ff94bb7fc611e98bcff82c9aec8054e5721b (patch) | |
| tree | 63f16b029dc91217d4a40ab10085e1b6e27bd5f2 | |
| parent | a4ffde6efe7d0218fc79e7d5b1307caa675dd358 (diff) | |
| parent | 6e65c7558de49a94aaacaf30a57b6af1771a2b5d (diff) | |
| download | gitlab-ce-2d93ff94bb7fc611e98bcff82c9aec8054e5721b.tar.gz | |
Merge branch '37912-fix-dash-in-note-access-role' into 'master'
Fix a dash being rendered in the note's access role
Closes #37912
See merge request gitlab-org/gitlab-ce!14450
| -rw-r--r-- | app/views/projects/notes/_actions.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/37912-fix-dash-in-note-access-role.yml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/views/projects/notes/_actions.html.haml b/app/views/projects/notes/_actions.html.haml index de76832331a..ab87b5e0005 100644 --- a/app/views/projects/notes/_actions.html.haml +++ b/app/views/projects/notes/_actions.html.haml @@ -1,7 +1,8 @@ +- access = note_max_access_for_user(note) - if note.has_special_role?(Note::SpecialRole::FIRST_TIME_CONTRIBUTOR) %span.note-role.note-role-special.has-tooltip{ title: _("This is the author's first Merge Request to this project. Handle with care.") } = issuable_first_contribution_icon -- if access = note_max_access_for_user(note) +- if access.nonzero? %span.note-role.note-role-access= Gitlab::Access.human_access(access) - if note.resolvable? diff --git a/changelogs/unreleased/37912-fix-dash-in-note-access-role.yml b/changelogs/unreleased/37912-fix-dash-in-note-access-role.yml new file mode 100644 index 00000000000..f9f4120479c --- /dev/null +++ b/changelogs/unreleased/37912-fix-dash-in-note-access-role.yml @@ -0,0 +1,5 @@ +--- +title: Notes will not show an empty bubble when the author isn't a member. +merge_request: 14450 +author: +type: fixed |