kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add data when member joined a team

Browse source
This commit is contained in:
Valery Sizov 2016-07-06 18:57:45 +03:00 committed by Dmitriy Zaporozhets
parent de073cf5ac
commit 7950fa48e8
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -47,6 +47,7 @@ v 8.10.0 (unreleased)
- Handle custom Git hook result in GitLab UI - Handle custom Git hook result in GitLab UI
- Allow '?', or '&' for label names - Allow '?', or '&' for label names
- Fix importer for GitHub Pull Requests when a branch was reused across Pull Requests - 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 v 8.9.5
- Add more debug info to import/export and memory killer. !5108 - Add more debug info to import/export and memory killer. !5108

4
app/views/shared/members/_member.html.haml
View file

@ -21,6 +21,10 @@
%span.cgray %span.cgray
– Requested – Requested
= time_ago_with_tooltip(member.requested_at) = time_ago_with_tooltip(member.requested_at)
- else
%span.cgray
= "(joined #{time_ago_with_tooltip(member.created_at)})"
- else - else
= image_tag avatar_icon(member.invite_email, 24), class: "avatar s24", alt: '' = image_tag avatar_icon(member.invite_email, 24), class: "avatar s24", alt: ''
%strong= member.invite_email %strong= member.invite_email