From 7950fa48e8976507261f62d6694c1f618b478b8c Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Wed, 6 Jul 2016 18:57:45 +0300
Subject: [PATCH] Add data when member joined a team
---
CHANGELOG | 1 +
app/views/shared/members/_member.html.haml | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index de5f1e8cda7..bc9bb7747a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,6 +47,7 @@ v 8.10.0 (unreleased)
- Handle custom Git hook result in GitLab UI
- Allow '?', or '&' for label names
- Fix importer for GitHub Pull Requests when a branch was reused across Pull Requests
+ - Add date when user joined the team on the member page
v 8.9.5
- Add more debug info to import/export and memory killer. !5108
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
--
GitLab