diff options
| author | Phil Hughes <me@iamphill.com> | 2018-10-03 17:22:52 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-03 17:22:52 +0300 |
| commit | f4db21eb22eeb9e07a9f5850d496570992f6d1f9 (patch) | |
| tree | d0f6189f0dad4bea314972034d1986815445a629 /app | |
| parent | cf26610f0372b89f34f1daba7f5279b95e0da5ff (diff) | |
| parent | e3b96ad76bfc1a64218abb731029bd95584abe7f (diff) | |
Merge branch '_acet-fix-placeholder-note' into 'master'
Fix placeholder note rendering.
Closes #48933
See merge request gitlab-org/gitlab-ce!22078
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 6ede7562edf..e9218723149 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -191,6 +191,7 @@ export default { if (note.placeholderType === SYSTEM_NOTE) { return placeholderSystemNote; } + return placeholderNote; } @@ -201,7 +202,7 @@ export default { return noteableNote; }, componentData(note) { - return note.isPlaceholderNote ? this.discussion.notes[0] : note; + return note.isPlaceholderNote ? note.notes[0] : note; }, toggleDiscussionHandler() { this.toggleDiscussion({ discussionId: this.discussion.id }); |