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

app/assets/javascripts/repo/repo_file.vue

@@ -41,10 +41,10 @@ export default RepoFile;
 
 <template>
 <tr v-if="!loading.tree || hasFiles" :class="{'active': activeFile.url === file.url}">
-  <td>
+  <td @click.prevent="linkClicked(file)">
     <i class="fa" v-if="!file.loading" :class="file.icon" :style="{'margin-left': file.level * 10 + 'px'}"></i>
     <i class="fa fa-spinner fa-spin" v-if="file.loading" :style="{'margin-left': file.level * 10 + 'px'}"></i>
-    <a :href="file.url" @click.prevent="linkClicked(file)" class="repo-file-name" :title="file.url">{{file.name}}</a>
+    <a :href="file.url" class="repo-file-name" :title="file.url">{{file.name}}</a>
   </td>
 
   <td v-if="!isMini" class="hidden-sm hidden-xs">

app/assets/javascripts/repo/repo_helper.js

@@ -87,7 +87,6 @@ const RepoHelper = {
       const fileIndex = indexOfFile + 1;
       const file = newFile;
       file.level = inDirectory.level + 1;
-
       oldList.splice(fileIndex, 0, file);
     });
 
@@ -140,7 +139,7 @@ const RepoHelper = {
       }
     })
     .catch(() => {
-      RepoHelper.setLoading(false, loadingData);
+      // RepoHelper.setLoading(false, loadingData);
       RepoHelper.loadingError();
     });
   },
@@ -179,6 +178,8 @@ const RepoHelper = {
     };
   },
 
+  
+
   scrollTabsRight() {
     // wait for the transition. 0.1 seconds. 
     setTimeout(() => {

app/assets/javascripts/repo/repo_sidebar.js

@@ -51,10 +51,11 @@ export default class RepoSidebar {
         linkClicked(clickedFile) {
           let url = '';
           let file = clickedFile;
-          file.loading = true;
           if (typeof file === 'object') {
+            file.loading = true;
             if (file.type === 'tree' && file.opened) {
               file = Store.removeChildFilesOfTree(file);
+              file.loading = false;
             } else {
               url = file.url;
               Service.url = url;
@@ -71,7 +72,6 @@ export default class RepoSidebar {
             url = file;
             Service.url = url;
             Helper.getContent(null, () => {
-              file.loading = false;
               Helper.scrollTabsRight();
             });
           }

app/assets/stylesheets/pages/repo.scss

@@ -40,8 +40,7 @@
       }
 
       .cursor {
-        background: $black;
-        border-color: $black;
+        display: none !important;
       }
     }
 
@@ -173,6 +172,7 @@
 
     tr {
       animation: fadein 0.5s;
+      cursor: pointer;
 
       &.repo-file-options td {
         padding: 0;