BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
3ac5efaa
Commit
3ac5efaa
authored
Apr 10, 2018
by
Fabian Schneider
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix `joined` information on project members page
parent
86ca1a77
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
_group.html.haml
app/views/shared/members/_group.html.haml
+1
-1
_member.html.haml
app/views/shared/members/_member.html.haml
+1
-1
30739-fix-joined-information-on-project-members-page.yml
.../30739-fix-joined-information-on-project-members-page.yml
+5
-0
No files found.
app/views/shared/members/_group.html.haml
View file @
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?
)
}
...
...
app/views/shared/members/_member.html.haml
View file @
3ac5efaa
...
...
@@ -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
)
}
...
...
changelogs/unreleased/30739-fix-joined-information-on-project-members-page.yml
0 → 100644
View file @
3ac5efaa
---
title
:
Fix `joined` information on project members page
merge_request
:
18290
author
:
Fabian Schneider
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment