Show user roles by comments.

3 files changed, 29 insertions, 9 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8a98da1a524..b21e202c540 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,7 @@ v 7.11.0 (unreleased)
   - Add current_sign_in_at to UserFull REST api.
   - Make Sidekiq MemoryKiller shutdown signal configurable
   - Add "Create Merge Request" buttons to commits and branches pages and push event.
+  - Show user roles by comments.
 
 v 7.10.2
   - Fix CI links on MR page
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 589a43c4264..61b907e39be 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -44,6 +44,14 @@ ul.notes {
     }
     .author-username {
     }
+
+    .note-role {
+      float: right;
+      margin-top: 2px;
+      border: 1px solid #bbb;
+      background-color: transparent;
+      color: #999;
+    }
   }
 
   .discussion {
@@ -136,6 +144,7 @@ ul.notes {
 .note {
   &.note:hover {
     .note-actions { display: block; }
+    .note-actions + .note-role { display: none; }
   }
   .discussion-header:hover {
     .discussion-actions { display: block; }
@@ -153,6 +162,8 @@ ul.notes {
     }
 
     a {
+      margin-left: 5px;
+
       @extend .cgray;
 
       &:hover {
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 4d26b52df01..2f3c407d6e9 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -9,22 +9,30 @@
     .timeline-content
       .note-header
         .note-actions
-          = link_to "##{dom_id(note)}", name: dom_id(note) do
-            = icon('link')
+          = link_to "##{dom_id(note)}", name: dom_id(note), title: "Link here" do
+            = icon('link fw')
             Link here
-           
+
           - if note_editable?(note)
             = link_to '#', title: 'Edit comment', class: 'js-note-edit' do
-              = icon('pencil-square-o')
+              = icon('pencil-square-o fw')
               Edit
-             
-            = link_to namespace_project_note_path(@project.namespace, @project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'danger js-note-delete' do
-              = icon('trash-o', class: 'cred')
+
+            = 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: 'danger js-note-delete' do
+              = icon('trash-o fw', class: 'cred')
               Remove
+
+        - unless note.system
+          - member = note.project.team.find_member(note.author.id)
+          - if member
+            %span.note-role.label
+              = member.human_access
+              
         - if note.system
           = link_to user_path(note.author) do
             = image_tag avatar_icon(note.author_email), class: 'avatar s16', alt: ''
-        = link_to_member(@project, note.author, avatar: false)
+
+        = link_to_member(note.project, note.author, avatar: false)
         %span.author-username
           = '@' + note.author.username
         %span.note-last-update
@@ -65,7 +73,7 @@
             = link_to note.attachment.url, target: '_blank' do
               = icon('paperclip')
               = note.attachment_identifier
-              = link_to delete_attachment_namespace_project_note_path(@project.namespace, @project, note),
+              = link_to delete_attachment_namespace_project_note_path(note.project.namespace, note.project, note),
                 title: 'Delete this attachment', method: :delete, remote: true, data: { confirm: 'Are you sure you want to remove the attachment?' }, class: 'danger js-note-attachment-delete' do
                 = icon('trash-o', class: 'cred')
       .clear