From 6755df108b123ecc8ae330d7c7bf2f04fbf36a81 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 21 Jan 2020 00:08:46 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/javascripts/notes/components/note_actions_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/javascripts/notes/components/note_actions_spec.js')

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,
     };
-- 
cgit v1.2.1