summaryrefslogtreecommitdiff
path: root/spec/javascripts/notes/components/note_actions_spec.js
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-18 21:07:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-18 21:07:37 +0000
commit7f8330873c1a5860b8a9a52d111083a65d210249 (patch)
treee6c7019f2942b8d2fff313545b7cb4bb996b6870 /spec/javascripts/notes/components/note_actions_spec.js
parentbbe243060399191abcba33c7ebd611f6ec34c6cd (diff)
downloadgitlab-ce-7f8330873c1a5860b8a9a52d111083a65d210249.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/notes/components/note_actions_spec.js')
-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 a65e2fc31ad..2e0694869ba 100644
--- a/spec/javascripts/notes/components/note_actions_spec.js
+++ b/spec/javascripts/notes/components/note_actions_spec.js
@@ -30,7 +30,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,
};