summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes/components/noteable_discussion.vue
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2018-12-21 17:00:26 +0000
committerWinnie Hellmann <winnie@gitlab.com>2018-12-21 17:00:26 +0000
commit0817c21067429842ec15f1e2f3088bc13b6bf57c (patch)
treeec25f4089d9dcec0e5de4c053ab3383bc58817f5 /app/assets/javascripts/notes/components/noteable_discussion.vue
parenta9049532a271117983430d2d80b8ad61879ecf7a (diff)
downloadgitlab-ce-0817c21067429842ec15f1e2f3088bc13b6bf57c.tar.gz
Revert "Merge branch 'winh-discussion-header-commented' into 'master'"
This reverts merge request !23622
Diffstat (limited to 'app/assets/javascripts/notes/components/noteable_discussion.vue')
-rw-r--r--app/assets/javascripts/notes/components/noteable_discussion.vue11
1 files changed, 0 insertions, 11 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index be451401e97..7c3f5d00308 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -212,16 +212,6 @@ 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() {
@@ -387,7 +377,6 @@ Please check your network connection and try again.`;
:note="componentData(initialDiscussion)"
:line="line"
:help-page-path="helpPagePath"
- :commit="commit"
@handleDeleteNote="deleteNoteHandler"
>
<note-edited-text