summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2016-08-03 20:57:54 +0200
committerAdam Niedzielski <adamsunday@gmail.com>2016-08-03 20:57:54 +0200
commit736ff98199941f0438d8425cded9e4f547538d71 (patch)
tree5e0bd4cea2ffa4025c36e9acc22c444809a0a08b /app/views
parentd12570280095cf26fc4a019b85579ecd3efdb7ec (diff)
downloadgitlab-ce-736ff98199941f0438d8425cded9e4f547538d71.tar.gz
Display expiration date in the project member list.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/members/_member.html.haml3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml
index 5ae485f36ba..aea08eac086 100644
--- a/app/views/shared/members/_member.html.haml
+++ b/app/views/shared/members/_member.html.haml
@@ -59,6 +59,9 @@
= time_ago_with_tooltip(member.requested_at)
- else
Joined #{time_ago_with_tooltip(member.created_at)}
+ - if member.expires_at.present?
+ %span.prepend-left-20
+ Access expires #{member.expires_at.to_s(:medium)}
- else
= image_tag avatar_icon(member.invite_email, 40), class: "avatar s40", alt: ''