diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/mr_notes | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/mr_notes')
-rw-r--r-- | app/assets/javascripts/mr_notes/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/mr_notes/init_notes.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/mr_notes/stores/index.js | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/mr_notes/index.js b/app/assets/javascripts/mr_notes/index.js index c1edf7be870..fb6ef0249bb 100644 --- a/app/assets/javascripts/mr_notes/index.js +++ b/app/assets/javascripts/mr_notes/index.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import store from 'ee_else_ce/mr_notes/stores'; +import store from '~/mr_notes/stores'; import initNotesApp from './init_notes'; import initDiffsApp from '../diffs'; import discussionCounter from '../notes/components/discussion_counter.vue'; diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js index 2580f8e86b1..fcde9bf7849 100644 --- a/app/assets/javascripts/mr_notes/init_notes.js +++ b/app/assets/javascripts/mr_notes/init_notes.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import Vue from 'vue'; import { mapActions, mapState, mapGetters } from 'vuex'; -import store from 'ee_else_ce/mr_notes/stores'; +import store from '~/mr_notes/stores'; import notesApp from '../notes/components/notes_app.vue'; import discussionKeyboardNavigator from '../notes/components/discussion_keyboard_navigator.vue'; import initWidget from '../vue_merge_request_widget'; diff --git a/app/assets/javascripts/mr_notes/stores/index.js b/app/assets/javascripts/mr_notes/stores/index.js index 8fbd0291a7d..8492b8d0aff 100644 --- a/app/assets/javascripts/mr_notes/stores/index.js +++ b/app/assets/javascripts/mr_notes/stores/index.js @@ -1,5 +1,6 @@ import Vue from 'vue'; import Vuex from 'vuex'; +import batchCommentsModule from '~/batch_comments/stores/modules/batch_comments'; import notesModule from '~/notes/stores/modules'; import diffsModule from '~/diffs/store/modules'; import mrPageModule from './modules'; @@ -12,6 +13,7 @@ export const createStore = () => page: mrPageModule(), notes: notesModule(), diffs: diffsModule(), + batchComments: batchCommentsModule(), }, }); |