Fix a dash being rendered in the note's access role

2017-09-25 21:35:13 +00:00 · 2017-09-25 21:35:13 +00:00 · 6e65c7558d
parent a4ffde6efe
commit 6e65c7558d
2 changed files with 7 additions and 1 deletions
--- 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?
--- a/changelogs/unreleased/37912-fix-dash-in-note-access-role.yml
+++ 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