Fixed sticky MR tabs positioning when sidebar is pinned

Closes #23926

CHANGELOG.md

@@ -43,6 +43,7 @@ Please view this file on the master branch, on stable branches it's out of date.
   - Fix importing MR comments from GitHub !7139
   - Modify GitHub importer to be retryable !7003
   - Fix and improve `Sortable.highest_label_priority`
+  - Fixed sticky merge request tabs when sidebar is pinned
 
 ## 8.13.1 (2016-10-25)
   - Fix branch protection API. !6215

app/assets/stylesheets/framework/sidebar.scss

@@ -164,6 +164,18 @@
       padding-left: $sidebar_width;
     }
   }
+
+  .merge-request-tabs-holder.affix {
+    @media (min-width: $sidebar-breakpoint) {
+      left: $sidebar_width;
+    }
+  }
+
+  &.right-sidebar-expanded {
+    .line-resolve-all-container {
+      display: none;
+    }
+  }
 }
 
 header.header-sidebar-pinned {