Merge branch 'fix-merge-request-show-component-z-indices' into 'master'

app/assets/stylesheets/framework/sidebar.scss

@@ -53,6 +53,7 @@
 
 .right-sidebar-expanded {
   padding-right: 0;
+  z-index: 300;
 
   @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
     &:not(.wiki-sidebar):not(.build-sidebar) .content-wrapper {

app/assets/stylesheets/pages/issuable.scss

@@ -206,7 +206,7 @@
   transition: width .3s;
   background: $gray-light;
   padding: 10px 20px;
-  z-index: 2;
+  z-index: 200;
 
   &.right-sidebar-expanded {
     width: $gutter_width;

app/assets/stylesheets/pages/merge_requests.scss

@@ -129,6 +129,7 @@
 
     .dropdown-menu {
       margin-top: 11px;
+      z-index: 200;
     }
 
     .ci-action-icon-wrapper {
@@ -703,6 +704,11 @@
 }
 
 .merge-request-tabs-holder {
+<<<<<<< HEAD
+=======
+  top: $header-height;
+  z-index: 100;
+>>>>>>> 3460f36... Merge branch 'fix-merge-request-show-component-z-indices' into 'master'
   background-color: $white-light;
 
   &.affix {