diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 00:09:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 00:09:09 +0300 |
| commit | cffe2c2c348d86d67298fa6516d49c36d696ab2d (patch) | |
| tree | 9511c62edd677012325946d19e4d2df4a9733aa1 /app/assets/javascripts/main.js | |
| parent | 7ff36fc6e9f0f5dffb41bfc79b4f07b2ce93e1c7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/main.js')
| -rw-r--r-- | app/assets/javascripts/main.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 4101b520e80..2f3cdc525a7 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -195,7 +195,11 @@ $body.on('click', 'a[href^="#"]', function clickHashLinkCallback() { * Quick fix: Get rid of jQuery for this implementation */ const isBoardsPage = /(projects|groups):boards:show/.test(document.body.dataset.page); -if (!isBoardsPage && (bootstrapBreakpoint === 'sm' || bootstrapBreakpoint === 'xs')) { +if ( + !isBoardsPage && + !window.gon?.features?.movedMrSidebar && + (bootstrapBreakpoint === 'sm' || bootstrapBreakpoint === 'xs') +) { const $rightSidebar = $('aside.right-sidebar'); const $layoutPage = $('.layout-page'); |