Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 6 deletions

diff --git a/app/assets/javascripts/alert_management/details.js b/app/assets/javascripts/alert_management/details.js
index 733ce649977..4217b702d0a 100644
--- a/app/assets/javascripts/alert_management/details.js
+++ b/app/assets/javascripts/alert_management/details.js
@@ -51,6 +51,9 @@ export default (selector) => {
   // eslint-disable-next-line no-new
   new Vue({
     el: selector,
+    components: {
+      AlertDetails,
+    },
     provide: {
       projectPath,
       alertId,
@@ -58,9 +61,6 @@ export default (selector) => {
       projectId,
     },
     apolloProvider,
-    components: {
-      AlertDetails,
-    },
     router,
     render(createElement) {
       return createElement('alert-details', {});
diff --git a/app/assets/javascripts/alert_management/list.js b/app/assets/javascripts/alert_management/list.js
index ce793464a38..b484841ed2c 100644
--- a/app/assets/javascripts/alert_management/list.js
+++ b/app/assets/javascripts/alert_management/list.js
@@ -48,6 +48,9 @@ export default () => {
 
   return new Vue({
     el: selector,
+    components: {
+      AlertManagementList,
+    },
     provide: {
       projectPath,
       textQuery,
@@ -59,9 +62,6 @@ export default () => {
       userCanEnableAlertManagement: parseBoolean(userCanEnableAlertManagement),
     },
     apolloProvider,
-    components: {
-      AlertManagementList,
-    },
     render(createElement) {
       return createElement('alert-management-list');
     },