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
eba02436
Commit
eba02436
authored
Aug 18, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redundant js-timeago-pending from user activity log
parent
08ab410f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/activities.js
app/assets/javascripts/activities.js
+1
-1
app/views/events/_event.html.haml
app/views/events/_event.html.haml
+1
-1
No files found.
CHANGELOG
View file @
eba02436
...
@@ -30,6 +30,7 @@ v 8.12.0 (unreleased)
...
@@ -30,6 +30,7 @@ v 8.12.0 (unreleased)
- Add last commit time to repo view (ClemMakesApps)
- Add last commit time to repo view (ClemMakesApps)
- Added project specific enable/disable setting for LFS !5997
- Added project specific enable/disable setting for LFS !5997
- Don't expose a user's token in the `/api/v3/user` API (!6047)
- Don't expose a user's token in the `/api/v3/user` API (!6047)
- Remove redundant js-timeago-pending from user activity log (ClemMakesApps)
- Added tests for diff notes
- Added tests for diff notes
- Add a button to download latest successful artifacts for branches and tags !5142
- Add a button to download latest successful artifacts for branches and tags !5142
- Remove redundant pipeline tooltips (ClemMakesApps)
- Remove redundant pipeline tooltips (ClemMakesApps)
...
...
app/assets/javascripts/activities.js
View file @
eba02436
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
}
}
Activities
.
prototype
.
updateTooltips
=
function
()
{
Activities
.
prototype
.
updateTooltips
=
function
()
{
return
gl
.
utils
.
localTimeAgo
(
$
(
'
.js-timeago
'
,
'
#activity
'
));
return
gl
.
utils
.
localTimeAgo
(
$
(
'
.js-timeago
'
,
'
.content_list
'
));
};
};
Activities
.
prototype
.
reloadActivities
=
function
()
{
Activities
.
prototype
.
reloadActivities
=
function
()
{
...
...
app/views/events/_event.html.haml
View file @
eba02436
-
if
event
.
visible_to_user?
(
current_user
)
-
if
event
.
visible_to_user?
(
current_user
)
.event-item
{
class:
event_row_class
(
event
)
}
.event-item
{
class:
event_row_class
(
event
)
}
.event-item-timestamp
.event-item-timestamp
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
#{
time_ago_with_tooltip
(
event
.
created_at
,
skip_js:
true
)
}
=
cache
[
event
,
current_application_settings
,
"v2.2"
]
do
=
cache
[
event
,
current_application_settings
,
"v2.2"
]
do
=
author_avatar
(
event
,
size:
40
)
=
author_avatar
(
event
,
size:
40
)
...
...
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