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

2 files changed, 8 insertions, 8 deletions

diff --git a/app/assets/javascripts/pipelines/components/dag/dag.vue b/app/assets/javascripts/pipelines/components/dag/dag.vue
index 2482af2c7f0..e44dedfe2ee 100644
--- a/app/assets/javascripts/pipelines/components/dag/dag.vue
+++ b/app/assets/javascripts/pipelines/components/dag/dag.vue
@@ -1,14 +1,14 @@
 <script>
 import { GlAlert, GlButton, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui';
 import { isEmpty } from 'lodash';
-import { __ } from '~/locale';
 import { fetchPolicies } from '~/lib/graphql';
+import { __ } from '~/locale';
+import { DEFAULT, PARSE_FAILURE, LOAD_FAILURE, UNSUPPORTED_DATA } from '../../constants';
 import getDagVisData from '../../graphql/queries/get_dag_vis_data.query.graphql';
-import DagGraph from './dag_graph.vue';
-import DagAnnotations from './dag_annotations.vue';
-import { ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from './constants';
 import { parseData } from '../parsing_utils';
-import { DEFAULT, PARSE_FAILURE, LOAD_FAILURE, UNSUPPORTED_DATA } from '../../constants';
+import { ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from './constants';
+import DagAnnotations from './dag_annotations.vue';
+import DagGraph from './dag_graph.vue';
 
 export default {
   // eslint-disable-next-line @gitlab/require-i18n-strings
diff --git a/app/assets/javascripts/pipelines/components/dag/dag_graph.vue b/app/assets/javascripts/pipelines/components/dag/dag_graph.vue
index 5ba0604fa01..7646c11773c 100644
--- a/app/assets/javascripts/pipelines/components/dag/dag_graph.vue
+++ b/app/assets/javascripts/pipelines/components/dag/dag_graph.vue
@@ -1,7 +1,10 @@
 <script>
 import * as d3 from 'd3';
 import { uniqueId } from 'lodash';
+import { PARSE_FAILURE } from '../../constants';
+import { getMaxNodes, removeOrphanNodes } from '../parsing_utils';
 import { LINK_SELECTOR, NODE_SELECTOR, ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from './constants';
+import { calculateClip, createLinkPath, createSankey, labelPosition } from './drawing_utils';
 import {
   currentIsLive,
   getLiveLinksAsDict,
@@ -10,9 +13,6 @@ import {
   toggleLinkHighlight,
   togglePathHighlights,
 } from './interactions';
-import { getMaxNodes, removeOrphanNodes } from '../parsing_utils';
-import { calculateClip, createLinkPath, createSankey, labelPosition } from './drawing_utils';
-import { PARSE_FAILURE } from '../../constants';
 
 export default {
   viewOptions: {