summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/activities.js
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2016-09-08 13:57:24 -0500
committerClement Ho <ClemMakesApps@gmail.com>2016-11-07 14:49:00 -0600
commitfa1ac47ef167e55d79a69d69596012fe5ac99d20 (patch)
tree74215243389cf58c556bb3a1a9f8cd85890e1f46 /app/assets/javascripts/activities.js
parent6be0c160d346c67967e541a76b6fbf6fc1ba2456 (diff)
downloadgitlab-ce-fa1ac47ef167e55d79a69d69596012fe5ac99d20.tar.gz
Replace jQuery.timeago with timeago.js
Diffstat (limited to 'app/assets/javascripts/activities.js')
-rw-r--r--app/assets/javascripts/activities.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/activities.js b/app/assets/javascripts/activities.js
index 59ac9b9cef5..919107b8cb9 100644
--- a/app/assets/javascripts/activities.js
+++ b/app/assets/javascripts/activities.js
@@ -13,12 +13,12 @@
}
Activities.prototype.updateTooltips = function() {
- return gl.utils.localTimeAgo($('.js-timeago', '.content_list'));
+ gl.utils.localTimeAgo($('.js-timeago', '.content_list'));
};
Activities.prototype.reloadActivities = function() {
$(".content_list").html('');
- return Pager.init(20, true);
+ Pager.init(20, true, false, this.updateTooltips);
};
Activities.prototype.toggleFilter = function(sender) {