diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-12 21:06:22 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-12 21:06:22 +0000 |
| commit | 4758db5af67ec8a9f6b43589d8236cfddf369a9d (patch) | |
| tree | 78ca4f036d10ab74af8cc03566a866b2c4bea91d | |
| parent | 3354523d09416cd3e12247ca8a9f0ec0588f4a05 (diff) | |
| parent | 3ac5efaa27eca24bf1733d0cc5f86ee2ccf0fac4 (diff) | |
| download | gitlab-ce-4758db5af67ec8a9f6b43589d8236cfddf369a9d.tar.gz | |
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
| -rw-r--r-- | app/views/shared/members/_group.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/30739-fix-joined-information-on-project-members-page.yml | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/views/shared/members/_group.html.haml b/app/views/shared/members/_group.html.haml index 5868c52566d..fc634856061 100644 --- a/app/views/shared/members/_group.html.haml +++ b/app/views/shared/members/_group.html.haml @@ -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?) } diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index ba57d922c6d..1c139827acf 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -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) } diff --git a/changelogs/unreleased/30739-fix-joined-information-on-project-members-page.yml b/changelogs/unreleased/30739-fix-joined-information-on-project-members-page.yml new file mode 100644 index 00000000000..f2d5b503661 --- /dev/null +++ b/changelogs/unreleased/30739-fix-joined-information-on-project-members-page.yml @@ -0,0 +1,5 @@ +--- +title: Fix `joined` information on project members page +merge_request: 18290 +author: Fabian Schneider +type: fixed |