diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-07 09:59:51 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-07 09:59:51 +0100 |
| commit | a2a8e36178853b5f8fa2eda306b33f8f97970745 (patch) | |
| tree | 0f8cf46e5c2968bcaa5a42c61f46338f1b921b0b /app/views/projects/notes | |
| parent | e85e1dbb57af835945b37dc03d1f850cbdaf4d82 (diff) | |
| parent | 95016507d49c3099afde0ef3909377bf70061dc3 (diff) | |
| download | gitlab-ce-a2a8e36178853b5f8fa2eda306b33f8f97970745.tar.gz | |
Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collections
* master: (6164 commits)
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_actions.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/notes/_actions.html.haml b/app/views/projects/notes/_actions.html.haml index de76832331a..5ea653ccad5 100644 --- a/app/views/projects/notes/_actions.html.haml +++ b/app/views/projects/notes/_actions.html.haml @@ -1,8 +1,9 @@ +- 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.") } + %span.note-role.note-role-special.has-tooltip{ title: _("This is the author's first Merge Request to this project.") } = issuable_first_contribution_icon -- if access = note_max_access_for_user(note) - %span.note-role.note-role-access= Gitlab::Access.human_access(access) +- if access.nonzero? + %span.note-role.user-access-role= Gitlab::Access.human_access(access) - if note.resolvable? - can_resolve = can?(current_user, :resolve_note, note) |