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

app/assets/javascripts/repo/repo_editor.vue

@@ -68,7 +68,7 @@ const RepoEditor = {
 
     editMode() {
       const panelClassList = document.querySelector('.panel-right').classList;
-      let readOnly = true;
+      let readOnly = false;
 
       if (this.editMode) {
         panelClassList.add('edit-mode');

app/assets/javascripts/repo/repo_helper.js

@@ -183,7 +183,9 @@ const RepoHelper = {
   scrollTabsRight() {
     // wait for the transition. 0.1 seconds.
     setTimeout(() => {
-      document.getElementById('tabs').scrollLeft = 12000;
+      const tabs = document.getElementById('tabs');
+      if(!tabs) return;
+      tabs.scrollLeft = 12000;
     }, 200)
   },
 

app/assets/javascripts/repo/repo_store.js

@@ -109,7 +109,7 @@ const RepoStore = {
     RepoStore.files = RepoStore.files.filter((file) => {
       const isItTheTreeWeWant = file.url === treeToClose.url;
       // if it's the next tree
-      if(foundTree && file.type === 'tree' && !isItTheTreeWeWant) {
+      if(foundTree && file.type === 'tree' && !isItTheTreeWeWant && file.level === treeToClose.level) {
         wereDone = true;
         return true;
       }

app/assets/stylesheets/pages/repo.scss

@@ -49,6 +49,7 @@
         .cursor {
           background: $black;
           border-color: $black;
+          display: block !important;
         }
       }
     }