diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
| commit | 0e7f8fd5bd7ed184b8a12039739200065ffa2dbd (patch) | |
| tree | 07b3c3bbcc0d05848ab7034d2ed32a801f8786b9 /app/assets/javascripts/notes/components/noteable_note.vue | |
| parent | 203d1026008effeeba5c1f98dba768448473f9fe (diff) | |
| parent | 904cbe0132a1caf0dbb7efb8bdc70398d1d82289 (diff) | |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
Diffstat (limited to 'app/assets/javascripts/notes/components/noteable_note.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 713f93456b1..9225a6b1a7c 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -170,7 +170,6 @@ export default { :author="author" :created-at="note.created_at" :note-id="note.id" - action-text="commented" /> <note-actions :author-id="author.id" |