Commit 3a583b07 authored by Mike Greiling's avatar Mike Greiling

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
parents 0397b813 dea03a08
...@@ -170,7 +170,6 @@ export default { ...@@ -170,7 +170,6 @@ export default {
:author="author" :author="author"
:created-at="note.created_at" :created-at="note.created_at"
:note-id="note.id" :note-id="note.id"
action-text="commented"
/> />
<note-actions <note-actions
:author-id="author.id" :author-id="author.id"
......
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
= note.author.to_reference = note.author.to_reference
%span.note-headline-light %span.note-headline-light
%span.note-headline-meta %span.note-headline-meta
- unless note.system
commented
- if note.system - if note.system
%span.system-note-message %span.system-note-message
= markdown_field(note, :note) = markdown_field(note, :note)
......
...@@ -32,7 +32,6 @@ describe('issue_note', () => { ...@@ -32,7 +32,6 @@ describe('issue_note', () => {
it('should render note header content', () => { 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-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', () => { it('should render note actions', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment