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

Merge branch 'resolve-discussions-timeago' into 'master'
ea068481 · Fatih Acet · 1f42395b · da553a4f · ea068481 · ea068481
Commit ea068481 authored Nov 24, 2016 by Fatih Acet
3 changed files
--- a/app/assets/javascripts/diff_notes/models/discussion.js.es6
+++ b/app/assets/javascripts/diff_notes/models/discussion.js.es6
@@ -57,14 +57,17 @@ class DiscussionModel {
  }
  updateHeadline (data) {
-    const $discussionHeadline = $(`.discussion[data-discussion-id="${this.id}"] .js-discussion-headline`);
+    const discussionSelector = `.discussion[data-discussion-id="${this.id}"]`;
+    const $discussionHeadline = $(`${discussionSelector} .js-discussion-headline`);
    if (data.discussion_headline_html) {
      if ($discussionHeadline.length) {
        $discussionHeadline.replaceWith(data.discussion_headline_html);
      } else {
-        $(`.discussion[data-discussion-id="${this.id}"] .discussion-header`).append(data.discussion_headline_html);
+        $(`${discussionSelector} .discussion-header`).append(data.discussion_headline_html);
      }
+      gl.utils.localTimeAgo($('.js-timeago', `${discussionSelector}`));
    } else {
       $discussionHeadline.remove();
    }

--- 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);
    };

--- a/changelogs/unreleased/resolve-discussions-timeago.yml
+++ b/changelogs/unreleased/resolve-discussions-timeago.yml
+---
+title: Fixed timeago not rendering when resolving a discussion
+merge_request: 
+author: