summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/ide/stores/mutations.js4
-rw-r--r--app/assets/javascripts/vue_shared/components/tabs/tab.vue4
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/stores/mutations.js b/app/assets/javascripts/ide/stores/mutations.js
index 375b4d8233d..633c93ed0a8 100644
--- a/app/assets/javascripts/ide/stores/mutations.js
+++ b/app/assets/javascripts/ide/stores/mutations.js
@@ -149,7 +149,9 @@ export default {
});
},
[types.SET_RIGHT_PANE](state, view) {
- state.rightPane = state.rightPane === view ? null : view;
+ Object.assign(state, {
+ rightPane: state.rightPane === view ? null : view,
+ });
},
...projectMutations,
...mergeRequestMutation,
diff --git a/app/assets/javascripts/vue_shared/components/tabs/tab.vue b/app/assets/javascripts/vue_shared/components/tabs/tab.vue
index 0ec7a0199fe..9b2f46186ac 100644
--- a/app/assets/javascripts/vue_shared/components/tabs/tab.vue
+++ b/app/assets/javascripts/vue_shared/components/tabs/tab.vue
@@ -27,7 +27,9 @@ export default {
this.isTab = true;
},
updated() {
- this.$parent.$forceUpdate();
+ if (this.$parent) {
+ this.$parent.$forceUpdate();
+ }
},
};
</script>