Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

2 files changed, 4 insertions, 6 deletions

diff --git a/app/assets/javascripts/mr_notes/index.js b/app/assets/javascripts/mr_notes/index.js
index 7424c011052..297420bf94d 100644
--- a/app/assets/javascripts/mr_notes/index.js
+++ b/app/assets/javascripts/mr_notes/index.js
@@ -5,9 +5,8 @@ import initRevertCommitModal from '~/projects/commit/init_revert_commit_modal';
 import initDiffsApp from '../diffs';
 import { resetServiceWorkersPublicPath } from '../lib/utils/webpack';
 import MergeRequest from '../merge_request';
-import discussionCounter from '../notes/components/discussion_counter.vue';
+import DiscussionCounter from '../notes/components/discussion_counter.vue';
 import initDiscussionFilters from '../notes/discussion_filters';
-import initSortDiscussions from '../notes/sort_discussions';
 import initNotesApp from './init_notes';
 
 export default function initMrNotes() {
@@ -38,7 +37,7 @@ export default function initMrNotes() {
         el,
         name: 'DiscussionCounter',
         components: {
-          discussionCounter,
+          DiscussionCounter,
         },
         store,
         render(createElement) {
@@ -52,6 +51,5 @@ export default function initMrNotes() {
     }
 
     initDiscussionFilters(store);
-    initSortDiscussions(store);
   });
 }
diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js
index cf24d18c7b6..e4a7a7bd9fc 100644
--- a/app/assets/javascripts/mr_notes/init_notes.js
+++ b/app/assets/javascripts/mr_notes/init_notes.js
@@ -4,7 +4,7 @@ import { mapActions, mapState, mapGetters } from 'vuex';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import store from '~/mr_notes/stores';
 import discussionNavigator from '../notes/components/discussion_navigator.vue';
-import notesApp from '../notes/components/notes_app.vue';
+import NotesApp from '../notes/components/notes_app.vue';
 import initWidget from '../vue_merge_request_widget';
 
 export default () => {
@@ -13,7 +13,7 @@ export default () => {
     el: '#js-vue-mr-discussions',
     name: 'MergeRequestDiscussions',
     components: {
-      notesApp,
+      NotesApp,
     },
     store,
     data() {