Merge branch 'username-issue-header' into 'master'

Added username to issue & merge request header Closes #13771 ## Issue header ![Screen_Shot_2016-03-01_at_16.59.32](/uploads/a112dfb91eb9b6f911c716265b35043c/Screen_Shot_2016-03-01_at_16.59.32.png) ## Merge request header ![Screen_Shot_2016-03-01_at_16.59.26](/uploads/67bf9e65ac5cae4667db6c5148cb57a0/Screen_Shot_2016-03-01_at_16.59.26.png) See merge request !3048

Merge branch 'username-issue-header' into 'master'
773718cb · Jacob Schatz · 386d442a · 6f265eb7 · 773718cb · 773718cb
Commit 773718cb authored Mar 02, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

show.html.haml app/views/projects/issues/show.html.haml +1 -0

_mr_title.html.haml app/views/projects/merge_requests/show/_mr_title.html.haml +1 -0

No files found.
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -29,6 +29,7 @@
      %span.creator
        &middot;
        by #{link_to_member(@project, @issue.author, size: 24)}
+        = '@' + @issue.author.username
        &middot;
        = time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago')


--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -6,6 +6,7 @@
  %span.creator
    &middot;
    by #{link_to_member(@project, @merge_request.author, size: 24)}
+    = '@' + @merge_request.author.username
    &middot;
    = time_ago_with_tooltip(@merge_request.created_at)