Merge branch '9-2-stable-fix-conflicts-for-mr-11399' into '9-2-stable'

Fix 9.2 conflicts for "prevent dropdowns from being cut-off by scrollable tab container"

See merge request !11486

app/assets/javascripts/diff_notes/diff_notes_bundle.js

@@ -65,4 +65,6 @@ $(() => {
       'resolve-count': ResolveCount
     }
   });
+
+  $(window).trigger('resize.nav');
 });

app/assets/stylesheets/framework/nav.scss

@@ -350,7 +350,10 @@
 .scrolling-tabs-container {
   position: relative;
-  overflow: hidden;
+
+  .merge-request-tabs-container & {
+    overflow: hidden;
+  }
   .nav-links {
     @include scrolling-links();
@@ -488,7 +491,6 @@
 .inner-page-scroll-tabs {
   position: relative;
-  overflow: hidden;
   .fade-right {
     @include fade(left, $white-light);