diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-24 21:28:45 +0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-12-01 17:48:16 +0300 |
| commit | c888d6a7445a0ad25bdbe3796f0ef16dfa7e2ef8 (patch) | |
| tree | a83a849b3837568eac28af1feaf2c93141255186 | |
| parent | 9de6041e1248c9f348e4337f0f994e200290759b (diff) | |
Merge branch 'fixed-commit-timeago' into 'master'
Fixed commit time not rendering after initial page load
## What does this MR do?
Inits the timeago for commits when infinite scrolling which fixes the issue of the timeago not rendering correctly when scrolling down.
## What are the relevant issue numbers?
Closes #24862
See merge request !7704
| -rw-r--r-- | app/assets/javascripts/commits.js | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/fixed-commit-timeago.yml | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/commits.js b/app/assets/javascripts/commits.js index 951fb338f9d..3627aaf5080 100644 --- a/app/assets/javascripts/commits.js +++ b/app/assets/javascripts/commits.js @@ -1,4 +1,4 @@ -/* eslint-disable func-names, space-before-function-paren, wrap-iife, quotes, consistent-return, no-undef, no-return-assign, no-param-reassign, one-var, no-var, one-var-declaration-per-line, no-unused-vars, prefer-template, object-shorthand, comma-dangle, padded-blocks, max-len */ +/* eslint-disable func-names, space-before-function-paren, wrap-iife, quotes, consistent-return, no-undef, no-return-assign, no-param-reassign, one-var, no-var, one-var-declaration-per-line, no-unused-vars, prefer-template, object-shorthand, comma-dangle, padded-blocks, max-len, prefer-arrow-callback */ (function() { this.CommitsList = (function() { function CommitsList() {} @@ -13,7 +13,9 @@ return false; } }); - Pager.init(limit, false); + Pager.init(limit, false, false, function() { + gl.utils.localTimeAgo($('.js-timeago')); + }); this.content = $("#commits-list"); this.searchField = $("#commits-search"); return this.initSearch(); diff --git a/changelogs/unreleased/fixed-commit-timeago.yml b/changelogs/unreleased/fixed-commit-timeago.yml new file mode 100644 index 00000000000..295d8db63d0 --- /dev/null +++ b/changelogs/unreleased/fixed-commit-timeago.yml @@ -0,0 +1,4 @@ +--- +title: Fixed commit timeago not rendering after initial page +merge_request: +author: |