diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-08 06:11:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-08 06:11:31 +0000 |
| commit | 3d1cade13f61115b63bf6dbda5a1f194ba54b24b (patch) | |
| tree | e9edc13dbd28ba1eb4bbeb995f596ead2ad28b2c /spec/features/merge_requests/diff_notes_resolve_spec.rb | |
| parent | 4040776430c2bbef689924c206e2c2c46428e4ef (diff) | |
| parent | f058b52b50c76de9557b167a1a31a5c9ba446f31 (diff) | |
| download | gitlab-ce-3d1cade13f61115b63bf6dbda5a1f194ba54b24b.tar.gz | |
Merge branch 'new-resolvable-discussion' into 'master'
Add option to start a new resolvable discussion in an MR
Closes #24378
See merge request !7527
Diffstat (limited to 'spec/features/merge_requests/diff_notes_resolve_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/diff_notes_resolve_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb index 69164aabdb2..88d28b649a4 100644 --- a/spec/features/merge_requests/diff_notes_resolve_spec.rb +++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb @@ -191,7 +191,7 @@ feature 'Diff notes resolve', feature: true, js: true do context 'multiple notes' do before do - create(:diff_note_on_merge_request, project: project, noteable: merge_request) + create(:diff_note_on_merge_request, project: project, noteable: merge_request, in_reply_to: note) visit_merge_request end |