Merge branch 'fix-vue-order-in-components-remove-rule-override' into 'master'

Remove vue/order-in-components override

See merge request gitlab-org/gitlab!51383

.eslintrc.yml

@@ -50,50 +50,6 @@ rules:
   # various vue lint rules as they were in eslint-plugin-vue@6, or disabling
   # new ones, to ease migration to v7, so violations of each can be fixed
   # separately.
-  vue/order-in-components:
-    - error
-    # This is the order from eslint-plugin-vue@6.2.2
-    - order:
-      - el
-      - name
-      - parent
-      - functional
-      -
-        - delimiters
-        - comments
-      -
-        - components
-        - directives
-        - filters
-      - extends
-      - mixins
-      - inheritAttrs
-      - model
-      -
-        - props
-        - propsData
-      - fetch
-      - asyncData
-      - data
-      - computed
-      - watch
-      -
-        - beforeCreate
-        - created
-        - beforeMount
-        - mounted
-        - beforeUpdate
-        - updated
-        - activated
-        - deactivated
-        - beforeDestroy
-        - destroyed
-      - methods
-      - head
-      -
-        - template
-        - render
-      - renderError
   vue/no-mutating-props: off
   vue/one-component-per-file: off
   vue/no-lone-template: off

app/assets/javascripts/boards/components/project_select_deprecated.vue

@@ -33,13 +33,13 @@ export default {
     GlDropdownText,
     GlSearchBoxByType,
   },
+  inject: ['groupId'],
   props: {
     list: {
       type: Object,
       required: true,
     },
   },
-  inject: ['groupId'],
   data() {
     return {
       initialLoading: true,

ee/app/assets/javascripts/issue_show/components/incidents/metrics_tab.vue

@@ -16,6 +16,7 @@ export default {
     MetricsImage,
     UploadDropzone,
   },
+  inject: ['canUpdate', 'projectId', 'iid'],
   data() {
     return {
       currentFiles: [],
@@ -23,7 +24,6 @@ export default {
       modalUrl: '',
     };
   },
-  inject: ['canUpdate', 'projectId', 'iid'],
   store: createStore(),
   computed: {
     ...mapState(['metricImages', 'isLoadingMetricImages', 'isUploadingImage']),