summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-03-27 17:02:39 +0200
committerTim Zallmann <tzallmann@gitlab.com>2018-03-27 17:02:39 +0200
commita90948f0d33469dc4773e7a03811cb8a003f1f0b (patch)
treec39680c46e586aae0ceab3afe785796428681954
parent3e308808aba739df694f4e21b8b52ad5c048e077 (diff)
downloadgitlab-ce-tz-ide-open-mr.tar.gz
Fixes for ESLint Errorstz-ide-open-mr
-rw-r--r--app/assets/javascripts/ide/components/editor_mode_dropdown.vue13
-rw-r--r--app/assets/javascripts/ide/components/ide.vue3
2 files changed, 12 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/components/editor_mode_dropdown.vue b/app/assets/javascripts/ide/components/editor_mode_dropdown.vue
index 399613912a7..0c44a755f56 100644
--- a/app/assets/javascripts/ide/components/editor_mode_dropdown.vue
+++ b/app/assets/javascripts/ide/components/editor_mode_dropdown.vue
@@ -26,6 +26,13 @@ export default {
required: true,
},
},
+ computed: {
+ mergeReviewLine() {
+ return sprintf(__('Reviewing (merge request !%{mergeRequestId})'), {
+ mergeRequestId: this.mergeRequestId,
+ });
+ },
+ },
methods: {
changeMode(mode) {
this.$emit('click', mode);
@@ -50,7 +57,7 @@ export default {
data-toggle="dropdown"
>
<template v-if="viewer === 'mrdiff' && mergeRequestId">
- {{ sprintf(__('Reviewing (merge request !%{mergeRequestId})'), { mergeRequestId }) }}
+ {{ mergeReviewLine }}
</template>
<template v-else-if="viewer === 'editor'">
{{ __('Editing') }}
@@ -75,7 +82,9 @@ export default {
'is-active': viewer === 'mrdiff',
}"
>
- <strong class="dropdown-menu-inner-title">{{ sprintf(__('Reviewing (merge request !%{mergeRequestId})'), { mergeRequestId }) }}</strong>
+ <strong class="dropdown-menu-inner-title">
+ {{ mergeReviewLine }}
+ </strong>
<span class="dropdown-menu-inner-content">
{{ __('Compare changes with the merge request target branch') }}
</span>
diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue
index c9439ed2b59..5e44af01241 100644
--- a/app/assets/javascripts/ide/components/ide.vue
+++ b/app/assets/javascripts/ide/components/ide.vue
@@ -6,7 +6,6 @@ import repoTabs from './repo_tabs.vue';
import repoFileButtons from './repo_file_buttons.vue';
import ideStatusBar from './ide_status_bar.vue';
import repoEditor from './repo_editor.vue';
-import { currentMergeRequest } from '../stores/getters';
export default {
components: {
@@ -33,7 +32,7 @@ export default {
},
computed: {
...mapState(['changedFiles', 'openFiles', 'viewer', 'currentMergeRequestId']),
- ...mapGetters(['activeFile', 'hasChanges', 'currentMergeRequest']),
+ ...mapGetters(['activeFile', 'hasChanges']),
},
mounted() {
const returnValue = 'Are you sure you want to lose unsaved changes?';