Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
7950fa48
Commit
7950fa48
authored
Jul 06, 2016
by
Valery Sizov
Committed by
Dmitriy Zaporozhets
Jul 07, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add data when member joined a team
parent
de073cf5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
CHANGELOG
CHANGELOG
+1
-0
app/views/shared/members/_member.html.haml
app/views/shared/members/_member.html.haml
+4
-0
No files found.
CHANGELOG
View file @
7950fa48
...
@@ -47,6 +47,7 @@ v 8.10.0 (unreleased)
...
@@ -47,6 +47,7 @@ v 8.10.0 (unreleased)
- Handle custom Git hook result in GitLab UI
- Handle custom Git hook result in GitLab UI
- Allow '?', or '&' for label names
- Allow '?', or '&' for label names
- Fix importer for GitHub Pull Requests when a branch was reused across Pull Requests
- Fix importer for GitHub Pull Requests when a branch was reused across Pull Requests
- Add date when user joined the team on the member page
v 8.9.5
v 8.9.5
- Add more debug info to import/export and memory killer. !5108
- Add more debug info to import/export and memory killer. !5108
...
...
app/views/shared/members/_member.html.haml
View file @
7950fa48
...
@@ -21,6 +21,10 @@
...
@@ -21,6 +21,10 @@
%span
.cgray
%span
.cgray
– Requested
– Requested
=
time_ago_with_tooltip
(
member
.
requested_at
)
=
time_ago_with_tooltip
(
member
.
requested_at
)
-
else
%span
.cgray
=
"(joined
#{
time_ago_with_tooltip
(
member
.
created_at
)
}
)"
-
else
-
else
=
image_tag
avatar_icon
(
member
.
invite_email
,
24
),
class:
"avatar s24"
,
alt:
''
=
image_tag
avatar_icon
(
member
.
invite_email
,
24
),
class:
"avatar s24"
,
alt:
''
%strong
=
member
.
invite_email
%strong
=
member
.
invite_email
...
...
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