diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 09:35:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 09:35:24 +0000 |
commit | 1d20d43661f3e98bde2bb5dc163a45fd90f8ac88 (patch) | |
tree | 53feb6983348a364ed4f52a4108866bf4ff0a599 /spec/javascripts/diffs/mock_data/diff_discussions.js | |
parent | 2774ddc308f96f49a0f26871ff544681229f4eee (diff) | |
download | gitlab-ce-1d20d43661f3e98bde2bb5dc163a45fd90f8ac88.tar.gz |
Add latest changes from gitlab-org/gitlab@12-9-stable-ee
Diffstat (limited to 'spec/javascripts/diffs/mock_data/diff_discussions.js')
-rw-r--r-- | spec/javascripts/diffs/mock_data/diff_discussions.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/javascripts/diffs/mock_data/diff_discussions.js b/spec/javascripts/diffs/mock_data/diff_discussions.js index a9b00634104..dc25dd1647a 100644 --- a/spec/javascripts/diffs/mock_data/diff_discussions.js +++ b/spec/javascripts/diffs/mock_data/diff_discussions.js @@ -64,7 +64,7 @@ export default { resolve_path: '/gitlab-org/gitlab-test/-/merge_requests/20/discussions/6b232e05bea388c6b043ccc243ba505faac04ea8/resolve', resolve_with_issue_path: - '/gitlab-org/gitlab-test/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', + '/gitlab-org/gitlab-test/-/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', }, { id: '1753', @@ -117,7 +117,7 @@ export default { resolve_path: '/gitlab-org/gitlab-test/-/merge_requests/20/discussions/6b232e05bea388c6b043ccc243ba505faac04ea8/resolve', resolve_with_issue_path: - '/gitlab-org/gitlab-test/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', + '/gitlab-org/gitlab-test/-/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', }, { id: '1754', @@ -160,7 +160,7 @@ export default { resolve_path: '/gitlab-org/gitlab-test/-/merge_requests/20/discussions/6b232e05bea388c6b043ccc243ba505faac04ea8/resolve', resolve_with_issue_path: - '/gitlab-org/gitlab-test/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', + '/gitlab-org/gitlab-test/-/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', }, { id: '1755', @@ -203,7 +203,7 @@ export default { resolve_path: '/gitlab-org/gitlab-test/-/merge_requests/20/discussions/6b232e05bea388c6b043ccc243ba505faac04ea8/resolve', resolve_with_issue_path: - '/gitlab-org/gitlab-test/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', + '/gitlab-org/gitlab-test/-/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', }, { id: '1756', @@ -246,7 +246,7 @@ export default { resolve_path: '/gitlab-org/gitlab-test/-/merge_requests/20/discussions/6b232e05bea388c6b043ccc243ba505faac04ea8/resolve', resolve_with_issue_path: - '/gitlab-org/gitlab-test/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', + '/gitlab-org/gitlab-test/-/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', }, ], individual_note: false, @@ -255,7 +255,7 @@ export default { resolve_path: '/gitlab-org/gitlab-test/-/merge_requests/20/discussions/6b232e05bea388c6b043ccc243ba505faac04ea8/resolve', resolve_with_issue_path: - '/gitlab-org/gitlab-test/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', + '/gitlab-org/gitlab-test/-/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', diff_file: { submodule: false, submodule_link: null, |