Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide

app/assets/javascripts/repo/components/repo.vue

@@ -48,8 +48,8 @@ export default {
 <div class="tree-content-holder">
   <repo-sidebar/><div class="panel-right" :class="{'edit-mode': editMode}">
     <repo-tabs/>
+    <component :is="currentBlobView" class="blob-viewer-container"></component>
     <repo-file-buttons/>
-    <component :is="currentBlobView"></component>
     <!-- <repo-binary-viewer/> soon™ -->
   </div>
   <repo-commit-section/>

app/assets/stylesheets/pages/repo.scss

@@ -93,6 +93,11 @@
       }
     }
 
+    .blob-viewer-container {
+      height: calc(100vh - 83px);
+      overflow: auto;
+    }
+
     #tabs {
       border-bottom: 1px solid $white-normal;
       padding-left: 0;