Use one helper for linking to team member. More clear title for Issue and MR

app/views/issues/show.html.haml

@@ -26,22 +26,16 @@
 
 .main_box
   .top_box_content
-    %h4
+    %h4.box-title
       - if @issue.closed
-        .alert-message.error.status_info Closed
-      - else
-        .alert-message.success.status_info Open
+        .error.status_info Closed
       = gfm escape_once(@issue.title)
 
   .middle_box_content
-    %cite.cgray Created by
-    = image_tag gravatar_icon(@issue.author_email), width: 16, class: "lil_av"
-    %strong.author= link_to_issue_author(@issue)
-
-    - if @issue.assignee
-      %cite.cgray and currently assigned to
-      = image_tag gravatar_icon(@issue.assignee_email), width: 16, class: "lil_av"
-      %strong.author= link_to_issue_assignee(@issue)
+    %cite.cgray
+      Created by #{link_to_member(@project, @issue.author)}
+      - if @issue.assignee
+        \ and currently assigned to #{link_to_member(@project, @issue.assignee)}
 
     - if @issue.milestone
       - milestone = @issue.milestone

app/views/merge_requests/show/_mr_box.html.haml

@@ -1,22 +1,16 @@
 .main_box
   .top_box_content
-    %h4
+    %h4.box-title
       - if @merge_request.closed
-        .alert-message.error.status_info Closed
-      - else
-        .alert-message.success.status_info Open
+        .error.status_info Closed
       = gfm escape_once(@merge_request.title)
 
   .middle_box_content
     %div
-      %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
-      = image_tag gravatar_icon(@merge_request.author_email), width: 16, class: "lil_av"
-      %strong.author= link_to_merge_request_author(@merge_request)
-
-      - if @merge_request.assignee
-        %cite.cgray , currently assigned to
-        = image_tag gravatar_icon(@merge_request.assignee_email), width: 16, class: "lil_av"
-        %strong.author= link_to_merge_request_assignee(@merge_request)
+      %cite.cgray
+        Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
+        - if @merge_request.assignee
+          \, currently assigned to #{link_to_member(@project, @merge_request.assignee)}
       - if @merge_request.milestone
         - milestone = @merge_request.milestone
         %cite.cgray and attached to milestone
@@ -27,10 +21,10 @@
     .bottom_box_content
       - if @merge_request.merged?
         %span
-          Merged by #{@merge_request.merge_event.author_name}
+          Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
           %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
       - elsif @merge_request.closed_event
         %span
-          Closed by #{@merge_request.closed_event.author_name}
+          Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
           %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
 

app/views/merge_requests/show/_mr_title.html.haml

@@ -7,7 +7,7 @@
 
   %span.right
     - if @merge_request.merged?
-      %span.btn.small.disabled.grouped
+      %span.btn.small.disabled.grouped.success
         %strong
           %i.icon-ok
           = "MERGED"