From 0eefbdb19e056bcaf38d981885b8b95624d5e178 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Thu, 10 May 2018 16:47:46 +0200
Subject: Fix part of spec/features/merge_request/user_posts_notes_spec.rb

---
 spec/features/merge_request/user_posts_notes_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb
index 8184a8c925a..8984e237e1e 100644
--- a/spec/features/merge_request/user_posts_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_notes_spec.rb
@@ -132,8 +132,8 @@ describe 'Merge request > User posts notes', :js do
         end
 
         page.within("#note_#{note.id}") do
-          is_expected.to have_css('.note_edited_ago')
-          expect(find('.note_edited_ago').text)
+          is_expected.to have_css('.edited-text time')
+          expect(find('.edited-text time').text)
             .to match(/less than a minute ago/)
         end
       end
-- 
cgit v1.2.1


From 1c33f84dd14a259c193655c30e6b7fedb0b01df8 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Thu, 10 May 2018 17:54:41 +0200
Subject: Add "resolved by" to discussions

---
 app/assets/javascripts/notes/components/note_body.vue  |  2 +-
 .../javascripts/notes/components/note_edited_text.vue  |  3 ++-
 .../notes/components/noteable_discussion.vue           | 18 ++++++++++++++++--
 app/serializers/discussion_entity.rb                   |  1 +
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue
index 2464f95b3c6..2e153e1e96d 100644
--- a/app/assets/javascripts/notes/components/note_body.vue
+++ b/app/assets/javascripts/notes/components/note_body.vue
@@ -107,7 +107,7 @@ export default {
       action-text="Edited"
     />
     <note-awards-list
-      v-if="note.award_emoji.length"
+      v-if="note.award_emoji && note.award_emoji.length"
       :note-id="note.id"
       :note-author-id="note.author.id"
       :awards="note.award_emoji"
diff --git a/app/assets/javascripts/notes/components/note_edited_text.vue b/app/assets/javascripts/notes/components/note_edited_text.vue
index 4ddca918495..bcf63d357a2 100644
--- a/app/assets/javascripts/notes/components/note_edited_text.vue
+++ b/app/assets/javascripts/notes/components/note_edited_text.vue
@@ -13,7 +13,7 @@ export default {
     },
     editedAt: {
       type: String,
-      required: true,
+      required: false,
     },
     editedBy: {
       type: Object,
@@ -33,6 +33,7 @@ export default {
   <div :class="className">
     {{ actionText }}
     <time-ago-tooltip
+      v-if="editedAt"
       :time="editedAt"
       tooltip-placement="bottom"
     />
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index 6a921c9908a..c135f0bc960 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -274,7 +274,21 @@ Please check your network connection and try again.`;
               :action-text-html="actionTextHtml"
             />
             <note-edited-text
-              v-if="lastUpdatedAt"
+              v-if="discussion.resolved && discussion.resolved_by_push"
+              :edited-at="discussion.resolved_at"
+              :edited-by="discussion.resolved_by"
+              action-text="Automatically resolved with a push"
+              class-name="discussion-headline-light js-discussion-headline"
+            />
+            <note-edited-text
+              v-if="discussion.resolved && !discussion.resolved_by_push"
+              :edited-at="discussion.resolved_at"
+              :edited-by="discussion.resolved_by"
+              action-text="Resolved"
+              class-name="discussion-headline-light js-discussion-headline"
+            />
+            <note-edited-text
+              v-if="lastUpdatedAt && !discussion.resolved"
               :edited-at="lastUpdatedAt"
               :edited-by="lastUpdatedBy"
               action-text="Last updated"
@@ -282,7 +296,7 @@ Please check your network connection and try again.`;
             />
           </div>
           <div
-            v-if="note.expanded || alwaysExpanded"
+            v-show="note.expanded || alwaysExpanded"
             class="discussion-body">
             <component
               :is="wrapperComponent"
diff --git a/app/serializers/discussion_entity.rb b/app/serializers/discussion_entity.rb
index 4e1819aa3fc..cd919ca511d 100644
--- a/app/serializers/discussion_entity.rb
+++ b/app/serializers/discussion_entity.rb
@@ -25,6 +25,7 @@ class DiscussionEntity < Grape::Entity
   expose :resolve_with_issue_path, if: -> (d, _) { d.resolvable? } do |discussion|
     new_project_issue_path(discussion.project, merge_request_to_resolve_discussions_of: discussion.noteable.iid, discussion_to_resolve: discussion.id)
   end
+  expose :resolved_by_push?, as: :resolved_by_push
 
   expose :diff_file, using: DiffFileEntity, if: -> (discussion, _) { discussion.respond_to?(:diff_file) }
 
-- 
cgit v1.2.1


From ed09d0c92944fe1e52b003cf48ec1dfab64e799c Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Thu, 10 May 2018 18:12:44 +0200
Subject: Fix
 spec/features/merge_request/user_resolves_outdated_diff_discussions_spec.rb

---
 app/assets/javascripts/notes/components/noteable_discussion.vue | 7 +++++++
 app/serializers/discussion_entity.rb                            | 1 -
 app/serializers/note_entity.rb                                  | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index c135f0bc960..2a6e8a17fe4 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -111,6 +111,13 @@ export default {
     newNotePath() {
       return this.getNoteableData.create_note_path;
     },
+    lastNote() {
+      if (notes.length > 1) {
+        return notes[notes.length - 1];
+      }
+
+      return null;
+    },
     lastUpdatedBy() {
       const { notes } = this.note;
 
diff --git a/app/serializers/discussion_entity.rb b/app/serializers/discussion_entity.rb
index cd919ca511d..4e1819aa3fc 100644
--- a/app/serializers/discussion_entity.rb
+++ b/app/serializers/discussion_entity.rb
@@ -25,7 +25,6 @@ class DiscussionEntity < Grape::Entity
   expose :resolve_with_issue_path, if: -> (d, _) { d.resolvable? } do |discussion|
     new_project_issue_path(discussion.project, merge_request_to_resolve_discussions_of: discussion.noteable.iid, discussion_to_resolve: discussion.id)
   end
-  expose :resolved_by_push?, as: :resolved_by_push
 
   expose :diff_file, using: DiffFileEntity, if: -> (discussion, _) { discussion.respond_to?(:diff_file) }
 
diff --git a/app/serializers/note_entity.rb b/app/serializers/note_entity.rb
index fe7fcee1a58..1c45395358e 100644
--- a/app/serializers/note_entity.rb
+++ b/app/serializers/note_entity.rb
@@ -27,6 +27,8 @@ class NoteEntity < API::Entities::Note
   expose :resolved?, as: :resolved
   expose :resolvable?, as: :resolvable
   expose :resolved_by, using: NoteUserEntity
+  expose :resolved_at
+  expose :resolved_by_push?, as: :resolved_by_push
 
   expose :system_note_icon_name, if: -> (note, _) { note.system? } do |note|
     SystemNoteHelper.system_note_icon_name(note)
-- 
cgit v1.2.1