Fix sidebar scrolling

app/assets/javascripts/build.js

@@ -68,9 +68,15 @@
     Build.prototype.initSidebar = function() {
       this.$sidebar = $('.js-build-sidebar');
       this.sidebarTranslationLimits = {
+<<<<<<< 3ee255139ab555ec49a177d3b2eed65580f36c4f
         min: $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight()
       };
       this.sidebarTranslationLimits.max = this.sidebarTranslationLimits.min + $('.scrolling-tabs-container').outerHeight();
+=======
+        min: 0
+      }
+      this.sidebarTranslationLimits.max = $('.scrolling-tabs-container').outerHeight() + $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight();
+>>>>>>> Fix sidebar scrolling
       this.$sidebar.css({
         top: this.sidebarTranslationLimits.max
       });

app/assets/stylesheets/framework/sidebar.scss

@@ -208,7 +208,9 @@ header.header-sidebar-pinned {
   padding-right: 0;
 
   @media (min-width: $screen-sm-min) {
-    padding-right: $sidebar_collapsed_width;
+    .content-wrapper {
+      padding-right: $sidebar_collapsed_width;
+    }
 
     .merge-request-tabs-holder.affix {
       right: $sidebar_collapsed_width;
@@ -234,7 +236,9 @@ header.header-sidebar-pinned {
   }
 
   @media (min-width: $screen-md-min) {
-    padding-right: $gutter_width;
+    .content-wrapper {
+      padding-right: $gutter_width;
+    }
 
     &:not(.with-overlay) .merge-request-tabs-holder.affix {
       right: $gutter_width;