summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-01 16:57:53 +0000
committerPhil Hughes <me@iamphill.com>2016-03-01 16:57:53 +0000
commit6f265eb757324cdd8bd9e8d7a06ef0288bd8eab0 (patch)
tree1ab60fb8dee3918e8cb72fdec7645684909453a6
parent9b3c1a8c4f53d97ef46e82706dc159756b354ad3 (diff)
downloadgitlab-ce-username-issue-header.tar.gz
Added username to issue & merge request headerusername-issue-header
Closes #13771
-rw-r--r--app/views/projects/issues/show.html.haml1
-rw-r--r--app/views/projects/merge_requests/show/_mr_title.html.haml1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 1173e0a78c7..7d8798981e3 100644
--- 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')
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index b634a4af8d2..339031f15b2 100644
--- 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)