diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-08-12 09:03:29 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-08-12 09:03:29 +0000 |
commit | 2f385f7fcb7bea82a0e8886404316026b8a1b5cc (patch) | |
tree | d54eea13243d3802113a0e1e1786475cc050e109 /app/assets | |
parent | 3cd627ace256866d76cd3392351839c731c5df89 (diff) | |
parent | 8cffa55b2cec3f2c95913af014a5c828cf547788 (diff) | |
download | gitlab-ce-2f385f7fcb7bea82a0e8886404316026b8a1b5cc.tar.gz |
Merge branch 'fe-fix-diffs-specs-leaking-store' into 'master'
[CE] FE fix diffs specs leaking store
See merge request gitlab-org/gitlab-ce!31698
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/mr_notes/stores/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/mr_notes/stores/modules/index.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/mr_notes/stores/index.js b/app/assets/javascripts/mr_notes/stores/index.js index c4225c8ec08..8fbd0291a7d 100644 --- a/app/assets/javascripts/mr_notes/stores/index.js +++ b/app/assets/javascripts/mr_notes/stores/index.js @@ -9,7 +9,7 @@ Vue.use(Vuex); export const createStore = () => new Vuex.Store({ modules: { - page: mrPageModule, + page: mrPageModule(), notes: notesModule(), diffs: diffsModule(), }, diff --git a/app/assets/javascripts/mr_notes/stores/modules/index.js b/app/assets/javascripts/mr_notes/stores/modules/index.js index 660081f76c8..c28e666943b 100644 --- a/app/assets/javascripts/mr_notes/stores/modules/index.js +++ b/app/assets/javascripts/mr_notes/stores/modules/index.js @@ -2,11 +2,11 @@ import actions from '../actions'; import getters from '../getters'; import mutations from '../mutations'; -export default { +export default () => ({ state: { activeTab: null, }, actions, getters, mutations, -}; +}); |