Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 1 deletions

diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
index ac2a4184176..acb2355852d 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js
@@ -173,7 +173,12 @@ export default class Shortcuts {
     e.preventDefault();
     const canaryCookieName = 'gitlab_canary';
     const currentValue = parseBoolean(Cookies.get(canaryCookieName));
-    Cookies.set(canaryCookieName, (!currentValue).toString(), { expires: 365, path: '/' });
+    Cookies.set(canaryCookieName, (!currentValue).toString(), {
+      expires: 365,
+      path: '/',
+      // next.gitlab.com uses a leading period. See https://gitlab.com/gitlab-org/gitlab/-/issues/350186
+      domain: `.${window.location.hostname}`,
+    });
     refreshCurrentPage();
   }