diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 12:06:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 12:06:12 +0000 |
| commit | 3fc9a8e6957ddf75576dc63069c4c0249514499f (patch) | |
| tree | 003e30463853843d6fb736a9396c7eb53a3dfc9a /spec/frontend/notes | |
| parent | e24153b0cb080b1b25076f8fd358b4273848f2e2 (diff) | |
| download | gitlab-ce-3fc9a8e6957ddf75576dc63069c4c0249514499f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/notes')
| -rw-r--r-- | spec/frontend/notes/mock_data.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/frontend/notes/mock_data.js b/spec/frontend/notes/mock_data.js index dc914ce8355..01cb70d395c 100644 --- a/spec/frontend/notes/mock_data.js +++ b/spec/frontend/notes/mock_data.js @@ -1094,8 +1094,9 @@ export const collapsedSystemNotes = [ noteable_type: 'Issue', resolvable: false, noteable_iid: 12, + start_description_version_id: undefined, note: 'changed the description', - note_html: ' <p dir="auto">changed the description 2 times within 1 minute </p>', + note_html: '<p dir="auto">changed the description</p>', current_user: { can_edit: false, can_award_emoji: true }, resolved: false, resolved_by: null, @@ -1106,7 +1107,6 @@ export const collapsedSystemNotes = [ '/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-shell%2Fissues%2F12%23note_905&user_id=1', human_access: 'Owner', path: '/gitlab-org/gitlab-shell/notes/905', - times_updated: 2, }, ], individual_note: true, |