Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-24 21:42:04 +0300
committerFatih Acet <acetfatih@gmail.com>2016-11-24 21:42:04 +0300
commitea0684818945fec96b52fa22ce52ea0991abdd4e (patch)
treed3846c315d1c91a6cfa929f7eb8dc4e35f012640 /app/assets/javascripts/notes.js
parent1f42395be15579cf81041c5ec03d919bb14e49ca (diff)
parentda553a4f915185f5cc45dfbbe5eba316fe968251 (diff)
Merge branch 'resolve-discussions-timeago' into 'master'
Fixed resolved discussion timeago not rendering ## What does this MR do? Initialises the timeago element when a discussion is updated or resolved. ## Screenshots (if relevant) ![Screen_Shot_2016-11-22_at_11.49.22](/uploads/02900cc4de019ac33cd4d59d586629aa/Screen_Shot_2016-11-22_at_11.49.22.png) ## What are the relevant issue numbers? Closes #24787 See merge request !7656
Diffstat (limited to 'app/assets/javascripts/notes.js')
-rw-r--r--app/assets/javascripts/notes.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index a84c514dac7..47e7b6f831b 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -333,7 +333,7 @@
gl.diffNotesCompileComponents();
}
- gl.utils.localTimeAgo($('.js-timeago', note_html), false);
+ gl.utils.localTimeAgo($('.js-timeago'), false);
return this.updateNotesCount(1);
};