From bc75527dca77b2b72331ac6cbd5928d5b8c0c419 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 26 Aug 2020 18:11:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/blob_edit/blob_bundle.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/assets/javascripts/blob_edit') diff --git a/app/assets/javascripts/blob_edit/blob_bundle.js b/app/assets/javascripts/blob_edit/blob_bundle.js index 89a4b6ec3e3..c9972f0b43c 100644 --- a/app/assets/javascripts/blob_edit/blob_bundle.js +++ b/app/assets/javascripts/blob_edit/blob_bundle.js @@ -67,12 +67,15 @@ export default () => { if (commitButton) { const { dismissKey, humanAccess } = suggestEl.dataset; + const urlParams = new URLSearchParams(window.location.search); + const mergeRequestPath = urlParams.get('mr_path') || true; + const commitCookieName = `suggest_gitlab_ci_yml_commit_${dismissKey}`; const commitTrackLabel = 'suggest_gitlab_ci_yml_commit_changes'; const commitTrackValue = '20'; commitButton.addEventListener('click', () => { - setCookie(commitCookieName, true); + setCookie(commitCookieName, mergeRequestPath); Tracking.event(undefined, 'click_button', { label: commitTrackLabel, -- cgit v1.2.3