Merge branch 'fix-vue-order-in-components-oncall_schedules' into 'master'

Fix component option order in oncall_schedules

See merge request gitlab-org/gitlab!51367

ee/app/assets/javascripts/oncall_schedules/components/add_edit_schedule_form.vue

@@ -38,7 +38,6 @@ export const i18n = {
 
 export default {
   i18n,
-  inject: ['projectPath', 'timezones'],
   components: {
     GlForm,
     GlFormGroup,
@@ -47,6 +46,7 @@ export default {
     GlDropdownItem,
     GlSearchBoxByType,
   },
+  inject: ['projectPath', 'timezones'],
   props: {
     form: {
       type: Object,

ee/app/assets/javascripts/oncall_schedules/components/add_edit_schedule_modal.vue

@@ -19,12 +19,12 @@ export const i18n = {
 
 export default {
   i18n,
-  inject: ['projectPath', 'timezones'],
   components: {
     GlModal,
     GlAlert,
     AddEditScheduleForm,
   },
+  inject: ['projectPath', 'timezones'],
   props: {
     modalId: {
       type: String,

ee/app/assets/javascripts/oncall_schedules/components/oncall_schedule.vue

@@ -34,7 +34,6 @@ export default {
   editScheduleModalId,
   deleteScheduleModalId,
   presetType: PRESET_TYPES.WEEKS,
-  inject: ['timezones'],
   components: {
     GlSprintf,
     GlCard,
@@ -50,6 +49,7 @@ export default {
     GlModal: GlModalDirective,
     GlTooltip: GlTooltipDirective,
   },
+  inject: ['timezones'],
   props: {
     schedule: {
       type: Object,

ee/app/assets/javascripts/oncall_schedules/components/oncall_schedules_wrapper.vue

@@ -29,7 +29,6 @@ export default {
   mockRotations,
   i18n,
   addScheduleModalId,
-  inject: ['emptyOncallSchedulesSvgPath', 'projectPath'],
   components: {
     GlAlert,
     GlButton,
@@ -41,6 +40,7 @@ export default {
   directives: {
     GlModal: GlModalDirective,
   },
+  inject: ['emptyOncallSchedulesSvgPath', 'projectPath'],
   data() {
     return {
       schedule: {},

ee/app/assets/javascripts/oncall_schedules/components/rotations/components/add_edit_rotation_form.vue

@@ -54,7 +54,6 @@ export default {
     palette: CHEVRON_SKIPPING_PALETTE_ENUM,
   },
   LENGTH_ENUM,
-  inject: ['projectPath'],
   components: {
     GlForm,
     GlFormGroup,
@@ -68,6 +67,7 @@ export default {
     GlToggle,
     GlCard,
   },
+  inject: ['projectPath'],
   props: {
     form: {
       type: Object,

ee/app/assets/javascripts/oncall_schedules/components/rotations/components/add_edit_rotation_modal.vue

@@ -27,12 +27,12 @@ export const i18n = {
 export default {
   i18n,
   LENGTH_ENUM,
-  inject: ['projectPath'],
   components: {
     GlModal,
     GlAlert,
     AddEditRotationForm,
   },
+  inject: ['projectPath'],
   props: {
     modalId: {
       type: String,