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

![Screen_Shot_2016-04-08_at_16.02.47](/uploads/40bffe9bb53c015f30ffa93bb018552b/Screen_Shot_2016-04-08_at_16.02.47.png)

Fixes #15049

See merge request !3618

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
+          - 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