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

app/assets/javascripts/repo/repo_helper.js

@@ -17,6 +17,7 @@ const RepoHelper = {
 
   getLanguageForFile(file, langs) {
     const ext = `.${file.name.split('.').pop()}`;
+    console.log('ext',ext,'ext')
     let foundLang;
     if (langs.some((l) => {
       if (l.extensions && l.extensions.indexOf(ext) > -1) {

app/assets/javascripts/repo/repo_prev_directory.js

@@ -2,7 +2,7 @@ const RepoPreviousDirectory = {
   template: `
   <tr>
     <td colspan='3'>
-      <a :href='prevUrl' @click.prevent='linkClicked(prevurl)'>..</a>
+      <a :href='prevUrl' @click.prevent='linkClicked(prevUrl)'>..</a>
     </td>
   </tr>
   `,