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

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:
Clement Ho 2018-04-12 21:06:22 +00:00
parent 3354523d09 3ac5efaa27
commit 4758db5af6
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/shared/members/_group.html.haml
View File

@ -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?) }

2
app/views/shared/members/_member.html.haml
View File

@ -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) }

5
changelogs/unreleased/30739-fix-joined-information-on-project-members-page.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix `joined` information on project members page
merge_request: 18290
author: Fabian Schneider
type: fixed