Merge branch '202109' into 'master'

Update main JavaScript file to only apply right sidebar CSS class when an aside is present

See merge request gitlab-org/gitlab!25164

app/assets/javascripts/main.js

@@ -201,9 +201,15 @@ document.addEventListener('DOMContentLoaded', () => {
   });
 
   if (bootstrapBreakpoint === 'sm' || bootstrapBreakpoint === 'xs') {
-    const $rightSidebar = $('aside.right-sidebar, .layout-page');
+    const $rightSidebar = $('aside.right-sidebar');
+    const $layoutPage = $('.layout-page');
 
-    $rightSidebar.removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
+    if ($rightSidebar.length > 0) {
+      $rightSidebar.removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
+      $layoutPage.removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
+    } else {
+      $layoutPage.removeClass('right-sidebar-expanded right-sidebar-collapsed');
+    }
   }
 
   // prevent default action for disabled buttons

changelogs/unreleased/202109.yml

+---
+title: update main javascript file to only apply right sidebar class when an aside
+  is present
+merge_request:
+author: Oregand
+type: fixed