summaryrefslogtreecommitdiff
path: root/spec/javascripts/notes
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 00:08:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 00:08:46 +0000
commit6755df108b123ecc8ae330d7c7bf2f04fbf36a81 (patch)
tree7609bd6c0a9ac607d8f57737a2c27a460b7fcfdd /spec/javascripts/notes
parentee7fba4b844935437233f6c5b74545a28bac4298 (diff)
downloadgitlab-ce-6755df108b123ecc8ae330d7c7bf2f04fbf36a81.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/notes')
-rw-r--r--spec/javascripts/notes/components/note_actions_spec.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/notes/components/note_actions_spec.js b/spec/javascripts/notes/components/note_actions_spec.js
index 259122597fb..5d13f587ca7 100644
--- a/spec/javascripts/notes/components/note_actions_spec.js
+++ b/spec/javascripts/notes/components/note_actions_spec.js
@@ -29,7 +29,7 @@ describe('noteActions', () => {
canAwardEmoji: true,
canReportAsAbuse: true,
noteId: '539',
- noteUrl: `${TEST_HOST}/group/project/merge_requests/1#note_1`,
+ noteUrl: `${TEST_HOST}/group/project/-/merge_requests/1#note_1`,
reportAbusePath: `${TEST_HOST}/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F7%23note_539&user_id=26`,
showReply: false,
};