Merge branch 'ce-to-ee-2018-04-01' into 'master'

CE upstream - 2018-04-01 15:25 UTC

See merge request gitlab-org/gitlab-ee!5191

app/assets/javascripts/ide/components/mr_file_icon.vue

@@ -9,12 +9,6 @@ export default {
   directives: {
     tooltip,
   },
-  props: {
-    file: {
-      type: Object,
-      required: true,
-    },
-  },
 };
 </script>
 
@@ -22,7 +16,7 @@ export default {
   <icon
     name="git-merge"
     v-tooltip
-    title="Part of merge request changes"
+    title="__('Part of merge request changes')"
     css-classes="ide-file-changed-icon"
     :size="12"
   />

app/assets/javascripts/ide/components/repo_file.vue

@@ -103,7 +103,6 @@ export default {
         </span>
         <span class="pull-right">
           <mr-file-icon
-            :file="file"
             v-if="file.mrChange"
           />
           <changed-file-icon

app/assets/javascripts/lib/utils/url_utility.js

@@ -84,10 +84,10 @@ export function redirectTo(url) {
   return window.location.assign(url);
 }
 
-export function webIDEUrl(projectUrl = undefined) {
+export function webIDEUrl(route = undefined) {
   let returnUrl = `${gon.relative_url_root}/-/ide/`;
-  if (projectUrl) {
-    returnUrl += `project${projectUrl}`;
+  if (route) {
+    returnUrl += `project${route}`;
   }
   return returnUrl;
 }