diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-24 15:12:38 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-24 15:12:38 +0000 |
| commit | a6af6bf6e21bb5b36a94ba334c99bc586cb3297b (patch) | |
| tree | 41a63f8d85f562573f45aa5898d749ceb51606a5 /spec/javascripts/notes/components/note_app_spec.js | |
| parent | ac8f85805c0ff7dd00072b2974fdd05724863816 (diff) | |
| parent | a1ee2072f1a7c197e13bd2d5f8ca59ad1deb1c49 (diff) | |
| download | gitlab-ce-a6af6bf6e21bb5b36a94ba334c99bc586cb3297b.tar.gz | |
Merge branch 'master' into 'prettify-all-the-things-7'prettify-all-the-things-7
# Conflicts:
# app/assets/javascripts/activities.js
Diffstat (limited to 'spec/javascripts/notes/components/note_app_spec.js')
| -rw-r--r-- | spec/javascripts/notes/components/note_app_spec.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/javascripts/notes/components/note_app_spec.js b/spec/javascripts/notes/components/note_app_spec.js index 3e289a6b8e6..06b30375306 100644 --- a/spec/javascripts/notes/components/note_app_spec.js +++ b/spec/javascripts/notes/components/note_app_spec.js @@ -97,8 +97,7 @@ describe('note_app', () => { }); it('should render list of notes', done => { - const note = - mockData.INDIVIDUAL_NOTE_RESPONSE_MAP.GET[ + const note = mockData.INDIVIDUAL_NOTE_RESPONSE_MAP.GET[ '/gitlab-org/gitlab-ce/issues/26/discussions.json' ][0].notes[0]; |