Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 9 deletions

diff --git a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue
index 5400f6657a5..c52e9f5c264 100644
--- a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue
+++ b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue
@@ -40,6 +40,11 @@ export default {
   directives: {
     GlTooltip,
   },
+  inject: {
+    gitlabAlertFields: {
+      default: gitlabFieldsMock,
+    },
+  },
   props: {
     payloadFields: {
       type: Array,
@@ -57,11 +62,6 @@ export default {
       gitlabFields: this.gitlabAlertFields,
     };
   },
-  inject: {
-    gitlabAlertFields: {
-      default: gitlabFieldsMock,
-    },
-  },
   computed: {
     mappingData() {
       return this.gitlabFields.map((gitlabField) => {
diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
index d183d95f359..1ae7f826ce6 100644
--- a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
+++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
@@ -117,6 +117,7 @@ export default {
   directives: {
     GlModal: GlModalDirective,
   },
+  mixins: [glFeatureFlagsMixin()],
   inject: {
     generic: {
       default: {},
@@ -125,7 +126,6 @@ export default {
       default: {},
     },
   },
-  mixins: [glFeatureFlagsMixin()],
   props: {
     loading: {
       type: Boolean,
diff --git a/app/assets/javascripts/alerts_settings/index.js b/app/assets/javascripts/alerts_settings/index.js
index cc939577717..85858956987 100644
--- a/app/assets/javascripts/alerts_settings/index.js
+++ b/app/assets/javascripts/alerts_settings/index.js
@@ -35,6 +35,9 @@ export default (el) => {
 
   return new Vue({
     el,
+    components: {
+      AlertSettingsWrapper,
+    },
     provide: {
       prometheus: {
         active: parseBoolean(prometheusActivated),
@@ -56,9 +59,6 @@ export default (el) => {
       multiIntegrations: parseBoolean(multiIntegrations),
     },
     apolloProvider,
-    components: {
-      AlertSettingsWrapper,
-    },
     render(createElement) {
       return createElement('alert-settings-wrapper');
     },