kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed Utility Function based on Review Comments

This commit is contained in:
Tim Zallmann 2018-03-28 15:35:28 +02:00
parent a868ca0b12
commit 9d958af5a2
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/ide/components/mr_file_icon.vue
View File

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

1
app/assets/javascripts/ide/components/repo_file.vue
View File

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

6
app/assets/javascripts/lib/utils/url_utility.js
View File

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