diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-06-19 16:43:57 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-06-19 16:43:57 +0000 |
| commit | 3a583b075bb9bfa6b5cfe696aca45eeec37251b3 (patch) | |
| tree | 134a1e74ffeb0e012947a8670b31c5ef8574f9da | |
| parent | 0397b8134fc56fc04a4f5b508bd44e51d460c6dc (diff) | |
| parent | dea03a0815ddceeadbb809cd4ed94f6603e4c411 (diff) | |
| download | gitlab-ce-3a583b075bb9bfa6b5cfe696aca45eeec37251b3.tar.gz | |
Merge branch '46250-remove-commented-from-comment-system-notes' into 'master'
Resolve "Remove “commented” from comment system notes"
Closes #46250
See merge request gitlab-org/gitlab-ce!19709
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 1 | ||||
| -rw-r--r-- | app/views/shared/notes/_note.html.haml | 2 | ||||
| -rw-r--r-- | spec/javascripts/notes/components/noteable_note_spec.js | 1 |
3 files changed, 0 insertions, 4 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" diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml index ca6e3602f05..526330f4e50 100644 --- a/app/views/shared/notes/_note.html.haml +++ b/app/views/shared/notes/_note.html.haml @@ -36,8 +36,6 @@ = note.author.to_reference %span.note-headline-light %span.note-headline-meta - - unless note.system - commented - if note.system %span.system-note-message = markdown_field(note, :note) diff --git a/spec/javascripts/notes/components/noteable_note_spec.js b/spec/javascripts/notes/components/noteable_note_spec.js index cfd037633e9..2ffdec7314d 100644 --- a/spec/javascripts/notes/components/noteable_note_spec.js +++ b/spec/javascripts/notes/components/noteable_note_spec.js @@ -32,7 +32,6 @@ describe('issue_note', () => { it('should render note header content', () => { expect(vm.$el.querySelector('.note-header .note-header-author-name').textContent.trim()).toEqual(note.author.name); - expect(vm.$el.querySelector('.note-header .note-headline-meta').textContent.trim()).toContain('commented'); }); it('should render note actions', () => { |