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

Merge branch '37912-fix-dash-in-note-access-role' into 'master'
2d93ff94 · Rémy Coutable · a4ffde6e · 6e65c755 · 2d93ff94 · 2d93ff94
Commit 2d93ff94 authored Sep 25, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

_actions.html.haml app/views/projects/notes/_actions.html.haml +2 -1

37912-fix-dash-in-note-access-role.yml changelogs/unreleased/37912-fix-dash-in-note-access-role.yml +5 -0

No files found.
--- a/app/views/projects/notes/_actions.html.haml
+++ b/app/views/projects/notes/_actions.html.haml
+- 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
+---
+title: Notes will not show an empty bubble when the author isn't a member.
+merge_request: 14450
+author:
+type: fixed