diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-12 17:21:12 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-12 17:21:12 +0000 |
| commit | c52c1922495d83b8ef877033ceab0abf2551bdf2 (patch) | |
| tree | fb33113bd4f9fbffe0388a1c9e31b5b87eec0144 | |
| parent | e1838980c6efaafe4b590a20d54dfdc420b2c7e2 (diff) | |
| parent | 6dacf0fd6d2627e05e50e0116566946e3b81bc5f (diff) | |
| download | gitlab-ce-c52c1922495d83b8ef877033ceab0abf2551bdf2.tar.gz | |
Merge branch 'member-access-note-row' into 'master'
Fixed issue with member access not being visible on notes
This happened because the `note-actions`, which houses the access, was wrapped in a `can_edit` if statement
Fixes #15049
See merge request !3618
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 5c42423541e..03a44ca99c0 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -10,12 +10,12 @@ = "#{note.author.to_reference} commented" %a{ href: "##{dom_id(note)}" } = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago') - - if note_editable?(note) - .note-actions - - access = note.project.team.human_max_access(note.author.id) - - if access - %span.note-role - = access + .note-actions + - access = note.project.team.human_max_access(note.author.id) + - if access + %span.note-role + = access + - if note_editable?(note) = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do = icon('pencil') = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do |