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
This commit is contained in:
commit
4758db5af6
|
@ -8,7 +8,7 @@
|
||||||
%strong
|
%strong
|
||||||
= link_to group.full_name, group_path(group)
|
= link_to group.full_name, group_path(group)
|
||||||
.cgray
|
.cgray
|
||||||
Joined #{time_ago_with_tooltip(group.created_at)}
|
Given access #{time_ago_with_tooltip(group_link.created_at)}
|
||||||
- if group_link.expires?
|
- if group_link.expires?
|
||||||
·
|
·
|
||||||
%span{ class: ('text-warning' if group_link.expires_soon?) }
|
%span{ class: ('text-warning' if group_link.expires_soon?) }
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
Requested
|
Requested
|
||||||
= time_ago_with_tooltip(member.requested_at)
|
= time_ago_with_tooltip(member.requested_at)
|
||||||
- else
|
- else
|
||||||
Joined #{time_ago_with_tooltip(member.created_at)}
|
Given access #{time_ago_with_tooltip(member.created_at)}
|
||||||
- if member.expires?
|
- 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) }
|
%span{ class: "#{"text-warning" if member.expires_soon?} has-tooltip", title: member.expires_at.to_time.in_time_zone.to_s(:medium) }
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fix `joined` information on project members page
|
||||||
|
merge_request: 18290
|
||||||
|
author: Fabian Schneider
|
||||||
|
type: fixed
|
Loading…
Reference in New Issue