Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-12-01 19:32:42 +0300
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-12-01 19:32:42 +0300
commit9ddc6cf05e52e1a90ca52ae28c95d05f5bdd2004 (patch)
treef8deb90f2e3e126ace2a1637515f5c498c6b1fa8 /app
parentd7568727b98d5a057968a564e3ee5d71bf7ff0c5 (diff)
parentf53e0fff47eda03296dee95dbd44b6f5a78c6269 (diff)
Merge branch 'username-in-comments' into 'master'
Username in comments Its hard to mention person in comment if you don't know his username. This patch show person username right after his name in comment row See merge request !1281
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/notes/_note.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index a25c5e207fb..b2abdf0035d 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -18,6 +18,8 @@
%i.fa.fa-trash-o.cred
Remove
= link_to_member(@project, note.author, avatar: false)
+ %span.author-username
+ = '@' + note.author.username
%span.note-last-update
= note_timestamp(note)