diff options
author | Constance Okoghenun <constanceokoghenun@gmail.com> | 2019-01-17 14:15:33 +0300 |
---|---|---|
committer | Constance Okoghenun <constanceokoghenun@gmail.com> | 2019-01-17 14:15:33 +0300 |
commit | c1c0c0c21b075ee9ee2eddb75ad9681f29765bb2 (patch) | |
tree | 81b8fac501896868be78ecefb1cda93188a3d24d /app/assets/javascripts/notes/components/noteable_discussion.vue | |
parent | eec16ee28c7b377101ab3d5f81835cd8c2020981 (diff) |
Display "commented" only for commit discussions on merge requests
Add commit prop to NoteableNote component and pass it from
NoteableDiscussion
Diffstat (limited to 'app/assets/javascripts/notes/components/noteable_discussion.vue')
-rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 4480ec74182..aeb7171068a 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -212,6 +212,16 @@ export default { return this.line; }, + commit() { + if (!this.discussion.for_commit) { + return null; + } + + return { + id: this.discussion.commit_id, + url: this.discussion.discussion_path, + }; + }, }, watch: { isReplying() { @@ -376,6 +386,7 @@ Please check your network connection and try again.`; :is="componentName(initialDiscussion)" :note="componentData(initialDiscussion)" :line="line" + :commit="commit" :help-page-path="helpPagePath" @handleDeleteNote="deleteNoteHandler" > |