Commit 4758db5a authored by Clement Ho's avatar Clement Ho

Merge branch '30739-fix-joined-information-on-project-members-page' into 'master'

Resolve "Weird "joined" information on project members page"

Closes #30739

See merge request gitlab-org/gitlab-ce!18290
parents 3354523d 3ac5efaa
......@@ -8,7 +8,7 @@
%strong
= link_to group.full_name, group_path(group)
.cgray
Joined #{time_ago_with_tooltip(group.created_at)}
Given access #{time_ago_with_tooltip(group_link.created_at)}
- if group_link.expires?
·
%span{ class: ('text-warning' if group_link.expires_soon?) }
......
......@@ -29,7 +29,7 @@
Requested
= time_ago_with_tooltip(member.requested_at)
- else
Joined #{time_ago_with_tooltip(member.created_at)}
Given access #{time_ago_with_tooltip(member.created_at)}
- if member.expires?
·
%span{ class: "#{"text-warning" if member.expires_soon?} has-tooltip", title: member.expires_at.to_time.in_time_zone.to_s(:medium) }
......
---
title: Fix `joined` information on project members page
merge_request: 18290
author: Fabian Schneider
type: fixed
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment