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:
authorValery Sizov <valery@gitlab.com>2016-07-06 18:57:45 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-07-07 09:15:49 +0300
commit7950fa48e8976507261f62d6694c1f618b478b8c (patch)
treefeca94d231601392b260f88194bc3bbbeef5cf1c /app
parentde073cf5ac7cea0ea0dc44c22f195dfad1581569 (diff)
Add data when member joined a team
Diffstat (limited to 'app')
-rw-r--r--app/views/shared/members/_member.html.haml4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml
index a884e78e6e7..a137fde1c13 100644
--- a/app/views/shared/members/_member.html.haml
+++ b/app/views/shared/members/_member.html.haml
@@ -21,6 +21,10 @@
%span.cgray
– Requested
= time_ago_with_tooltip(member.requested_at)
+ - else
+ %span.cgray
+ = "(joined #{time_ago_with_tooltip(member.created_at)})"
+
- else
= image_tag avatar_icon(member.invite_email, 24), class: "avatar s24", alt: ''
%strong= member.invite_email