diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-24 19:00:26 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-24 19:00:26 +0000 |
| commit | af50d334e70851164eb1b9bb5468581dd5c7dd4f (patch) | |
| tree | be42ab33febc8101c87db771220ddd055f8e20c8 /spec/features/merge_requests/versions_spec.rb | |
| parent | a1330526691fc4b0b2ab7cc28dfe04f7bd42e99b (diff) | |
| parent | 0bf339f0ed2f91a805e99fc7483572ad7d22093a (diff) | |
| download | gitlab-ce-af50d334e70851164eb1b9bb5468581dd5c7dd4f.tar.gz | |
Merge branch 'dm-outdated-system-note' into 'master'
Add system note with link to diff comparison when MR discussion becomes outdated
Closes #30058
See merge request !11584
Diffstat (limited to 'spec/features/merge_requests/versions_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/versions_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/merge_requests/versions_spec.rb b/spec/features/merge_requests/versions_spec.rb index aef8ef20938..aad522ee26e 100644 --- a/spec/features/merge_requests/versions_spec.rb +++ b/spec/features/merge_requests/versions_spec.rb @@ -124,6 +124,8 @@ feature 'Merge Request versions', js: true, feature: true do diff_refs: merge_request_diff3.compare_with(merge_request_diff1.head_commit_sha).diff_refs ) outdated_diff_note = create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position) + outdated_diff_note.position = outdated_diff_note.original_position + outdated_diff_note.save! visit current_url wait_for_requests |