diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-28 15:35:28 +0200 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-28 15:35:28 +0200 |
commit | 9d958af5a2a8c667509d6fce9729a1c5997e229b (patch) | |
tree | ec959779e056a98cb873c4b1fcc45f5afab5682b /app | |
parent | a868ca0b12df1f4043ece512a318bca7d0ea9b99 (diff) | |
download | gitlab-ce-9d958af5a2a8c667509d6fce9729a1c5997e229b.tar.gz |
Fixed Utility Function based on Review Comments
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/ide/components/mr_file_icon.vue | 8 | ||||
-rw-r--r-- | app/assets/javascripts/ide/components/repo_file.vue | 1 | ||||
-rw-r--r-- | app/assets/javascripts/lib/utils/url_utility.js | 6 |
3 files changed, 4 insertions, 11 deletions
diff --git a/app/assets/javascripts/ide/components/mr_file_icon.vue b/app/assets/javascripts/ide/components/mr_file_icon.vue index e4c90ce0101..8a440902dfc 100644 --- a/app/assets/javascripts/ide/components/mr_file_icon.vue +++ b/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" /> diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue index cdc9cd30a7e..1935ee1a4bb 100644 --- a/app/assets/javascripts/ide/components/repo_file.vue +++ b/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 diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js index f5adfa2f356..dd17544b656 100644 --- a/app/assets/javascripts/lib/utils/url_utility.js +++ b/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; } |