Add latest changes from gitlab-org/gitlab@master

5 files changed, 5 insertions, 5 deletions

diff --git a/app/assets/javascripts/ci/pipeline_details/dag/components/dag_graph.vue b/app/assets/javascripts/ci/pipeline_details/dag/components/dag_graph.vue
index 67e80145e83..6e975d55a7f 100644
--- a/app/assets/javascripts/ci/pipeline_details/dag/components/dag_graph.vue
+++ b/app/assets/javascripts/ci/pipeline_details/dag/components/dag_graph.vue
@@ -4,7 +4,7 @@ import { uniqueId } from 'lodash';
 import { getMaxNodes, removeOrphanNodes } from '~/ci/pipeline_details/utils/parsing_utils';
 import { PARSE_FAILURE } from '../../constants';
 import { LINK_SELECTOR, NODE_SELECTOR, ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from '../constants';
-import { calculateClip, createLinkPath, createSankey, labelPosition } from '../drawing_utils';
+import { calculateClip, createLinkPath, createSankey, labelPosition } from '../utils/drawing_utils';
 import {
   currentIsLive,
   getLiveLinksAsDict,
@@ -12,7 +12,7 @@ import {
   restoreLinks,
   toggleLinkHighlight,
   togglePathHighlights,
-} from '../interactions';
+} from '../utils/interactions';
 
 export default {
   viewOptions: {
diff --git a/app/assets/javascripts/ci/pipeline_details/dag/drawing_utils.js b/app/assets/javascripts/ci/pipeline_details/dag/utils/drawing_utils.js
index 3cd09d57ffb..3cd09d57ffb 100644
--- a/app/assets/javascripts/ci/pipeline_details/dag/drawing_utils.js
+++ b/app/assets/javascripts/ci/pipeline_details/dag/utils/drawing_utils.js
diff --git a/app/assets/javascripts/ci/pipeline_details/dag/interactions.js b/app/assets/javascripts/ci/pipeline_details/dag/utils/interactions.js
index 69f36feeee4..d2b7b7f9069 100644
--- a/app/assets/javascripts/ci/pipeline_details/dag/interactions.js
+++ b/app/assets/javascripts/ci/pipeline_details/dag/utils/interactions.js
@@ -1,5 +1,5 @@
 import * as d3 from 'd3';
-import { LINK_SELECTOR, NODE_SELECTOR, IS_HIGHLIGHTED } from './constants';
+import { LINK_SELECTOR, NODE_SELECTOR, IS_HIGHLIGHTED } from '../constants';
 
 export const highlightIn = 1;
 export const highlightOut = 0.2;
diff --git a/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_table.vue b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_table.vue
index 9784186ac67..f7a620c13a4 100644
--- a/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_table.vue
+++ b/app/assets/javascripts/ci/pipeline_details/pipelines_list/components/pipelines_table.vue
@@ -113,7 +113,7 @@ export default {
           key: 'actions',
           thClass: DEFAULT_TH_CLASSES,
           tdClass: this.tdClasses,
-          columnClass: 'gl-w-15p',
+          columnClass: 'gl-w-20p',
           thAttr: { 'data-testid': 'actions-th' },
         },
       ];
diff --git a/app/assets/javascripts/ci/pipeline_details/utils/parsing_utils.js b/app/assets/javascripts/ci/pipeline_details/utils/parsing_utils.js
index cfe488b7d14..0a2a6d16498 100644
--- a/app/assets/javascripts/ci/pipeline_details/utils/parsing_utils.js
+++ b/app/assets/javascripts/ci/pipeline_details/utils/parsing_utils.js
@@ -1,6 +1,6 @@
 import { memoize } from 'lodash';
 import { EXPLICIT_NEEDS_PROPERTY, NEEDS_PROPERTY } from '../constants';
-import { createSankey } from '../dag/drawing_utils';
+import { createSankey } from '../dag/utils/drawing_utils';
 import { createNodeDict } from './index';
 
 /*