summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs/components/diff_content.vue
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-07-06 17:26:18 +0100
committerFilipa Lacerda <filipa@gitlab.com>2018-07-06 17:26:18 +0100
commit156a9d39131b6193e0e6bc5ec7f1683305166fa8 (patch)
tree703f54b964712eb40ac2b3337da8aa73453b3156 /app/assets/javascripts/diffs/components/diff_content.vue
parent7a17f8d85deb50c933d6a82a354c3e58dc614544 (diff)
downloadgitlab-ce-156a9d39131b6193e0e6bc5ec7f1683305166fa8.tar.gz
Transforms diffs module to a namespaced one to avoid console error due to rewire export.
Detailed: Because of rewire we need to export a default empty object in our actions to prevent it to export the wrong default in karma. Vuex getters are global, and because the Vuex store uses several non namespaced moduled, there was already a getter named default, due to the same empty export. In order to solve it I chose to namespace the module. Could also be fixed by importing the getters explicitly instead of all of them.
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_content.vue')
-rw-r--r--app/assets/javascripts/diffs/components/diff_content.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue
index b6af49c7e2e..ff58e45400b 100644
--- a/app/assets/javascripts/diffs/components/diff_content.vue
+++ b/app/assets/javascripts/diffs/components/diff_content.vue
@@ -22,7 +22,7 @@ export default {
projectPath: state => state.diffs.projectPath,
endpoint: state => state.diffs.endpoint,
}),
- ...mapGetters(['isInlineView', 'isParallelView']),
+ ...mapGetters('diffs', ['isInlineView', 'isParallelView']),
diffMode() {
const diffModeKey = Object.keys(diffModes).find(key => this.diffFile[`${key}File`]);
return diffModes[diffModeKey] || diffModes.replaced;