BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 2d93ff94 by Rémy Coutable
Options

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
parents a4ffde6e 6e65c755
Showing with 7 additions and 1 deletion
app/views/projects/notes/_actions.html.haml
- access = note_max_access_for_user(note)
- if note.has_special_role?(Note::SpecialRole::FIRST_TIME_CONTRIBUTOR) - 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.") } %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 = 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) %span.note-role.note-role-access= Gitlab::Access.human_access(access)
- if note.resolvable? - if note.resolvable?
......
changelogs/unreleased/37912-fix-dash-in-note-access-role.yml 0 → 100644
---
title: Notes will not show an empty bubble when the author isn't a member.
merge_request: 14450
author:
type: fixed
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment