diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-07-06 18:57:45 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-07 09:15:49 +0300 |
| commit | 7950fa48e8976507261f62d6694c1f618b478b8c (patch) | |
| tree | feca94d231601392b260f88194bc3bbbeef5cf1c | |
| parent | de073cf5ac7cea0ea0dc44c22f195dfad1581569 (diff) | |
| download | gitlab-ce-7950fa48e8976507261f62d6694c1f618b478b8c.tar.gz | |
Add data when member joined a team
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 4 |
2 files changed, 5 insertions, 0 deletions
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 |