Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

5 files changed, 11 insertions, 11 deletions

diff --git a/app/assets/javascripts/related_issues/components/add_issuable_form.vue b/app/assets/javascripts/related_issues/components/add_issuable_form.vue
index 6fbae95094a..02929062cee 100644
--- a/app/assets/javascripts/related_issues/components/add_issuable_form.vue
+++ b/app/assets/javascripts/related_issues/components/add_issuable_form.vue
@@ -1,8 +1,7 @@
 <script>
 import { GlFormGroup, GlFormRadioGroup, GlButton } from '@gitlab/ui';
-import { __ } from '~/locale';
-import RelatedIssuableInput from './related_issuable_input.vue';
 import { mergeUrlParams } from '~/lib/utils/url_utility';
+import { __ } from '~/locale';
 
 import {
   issuableTypesMap,
@@ -11,6 +10,7 @@ import {
   addRelatedIssueErrorMap,
   addRelatedItemErrorMap,
 } from '../constants';
+import RelatedIssuableInput from './related_issuable_input.vue';
 
 export default {
   name: 'AddIssuableForm',
diff --git a/app/assets/javascripts/related_issues/components/related_issuable_input.vue b/app/assets/javascripts/related_issues/components/related_issuable_input.vue
index a124b055e19..2dc56c3110b 100644
--- a/app/assets/javascripts/related_issues/components/related_issuable_input.vue
+++ b/app/assets/javascripts/related_issues/components/related_issuable_input.vue
@@ -1,13 +1,13 @@
 <script>
 import $ from 'jquery';
 import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete';
-import issueToken from './issue_token.vue';
 import {
   autoCompleteTextMap,
   inputPlaceholderConfidentialTextMap,
   inputPlaceholderTextMap,
   issuableTypesMap,
 } from '../constants';
+import issueToken from './issue_token.vue';
 
 const SPACE_FACTOR = 1;
 
diff --git a/app/assets/javascripts/related_issues/components/related_issues_block.vue b/app/assets/javascripts/related_issues/components/related_issues_block.vue
index 2591e3e7f48..c042f0eef5f 100644
--- a/app/assets/javascripts/related_issues/components/related_issues_block.vue
+++ b/app/assets/javascripts/related_issues/components/related_issues_block.vue
@@ -1,13 +1,13 @@
 <script>
 import { GlLink, GlIcon, GlButton } from '@gitlab/ui';
-import AddIssuableForm from './add_issuable_form.vue';
-import RelatedIssuesList from './related_issues_list.vue';
 import {
   issuableIconMap,
   issuableQaClassMap,
   linkedIssueTypesMap,
   linkedIssueTypesTextMap,
 } from '../constants';
+import AddIssuableForm from './add_issuable_form.vue';
+import RelatedIssuesList from './related_issues_list.vue';
 
 export default {
   name: 'RelatedIssuesBlock',
@@ -146,7 +146,7 @@ export default {
             class="gl-display-flex gl-align-items-center gl-ml-2 gl-text-gray-500"
             :aria-label="__('Read more about related issues')"
           >
-            <gl-icon name="question" :size="12" role="text" />
+            <gl-icon name="question" :size="12" />
           </gl-link>
 
           <div class="gl-display-inline-flex">
diff --git a/app/assets/javascripts/related_issues/components/related_issues_list.vue b/app/assets/javascripts/related_issues/components/related_issues_list.vue
index 8021d390d95..825a4a02b71 100644
--- a/app/assets/javascripts/related_issues/components/related_issues_list.vue
+++ b/app/assets/javascripts/related_issues/components/related_issues_list.vue
@@ -60,8 +60,8 @@ export default {
       const nextItemEl = itemEl.nextElementSibling;
 
       return {
-        beforeId: prevItemEl && parseInt(prevItemEl.dataset.orderingId, 0),
-        afterId: nextItemEl && parseInt(nextItemEl.dataset.orderingId, 0),
+        beforeId: prevItemEl && parseInt(prevItemEl.dataset.orderingId, 10),
+        afterId: nextItemEl && parseInt(nextItemEl.dataset.orderingId, 10),
       };
     },
     reordered(event) {
diff --git a/app/assets/javascripts/related_issues/components/related_issues_root.vue b/app/assets/javascripts/related_issues/components/related_issues_root.vue
index a81edcf141c..c35a1ff0b63 100644
--- a/app/assets/javascripts/related_issues/components/related_issues_root.vue
+++ b/app/assets/javascripts/related_issues/components/related_issues_root.vue
@@ -25,9 +25,6 @@ Your caret can stop touching a `rawReference` can happen in a variety of ways:
 */
 import { deprecatedCreateFlash as Flash } from '~/flash';
 import { __ } from '~/locale';
-import RelatedIssuesBlock from './related_issues_block.vue';
-import RelatedIssuesStore from '../stores/related_issues_store';
-import RelatedIssuesService from '../services/related_issues_service';
 import {
   relatedIssuesRemoveErrorMap,
   pathIndeterminateErrorMap,
@@ -35,6 +32,9 @@ import {
   issuableTypesMap,
   PathIdSeparator,
 } from '../constants';
+import RelatedIssuesService from '../services/related_issues_service';
+import RelatedIssuesStore from '../stores/related_issues_store';
+import RelatedIssuesBlock from './related_issues_block.vue';
 
 export default {
   name: 'RelatedIssuesRoot',