Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 8 deletions

diff --git a/app/assets/javascripts/pipelines/components/graph/job_item.vue b/app/assets/javascripts/pipelines/components/graph/job_item.vue
index f099372d6db..90ffa258884 100644
--- a/app/assets/javascripts/pipelines/components/graph/job_item.vue
+++ b/app/assets/javascripts/pipelines/components/graph/job_item.vue
@@ -4,7 +4,7 @@ import ActionComponent from './action_component.vue';
 import JobNameComponent from './job_name_component.vue';
 import { sprintf } from '~/locale';
 import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin';
-import { accessors } from './accessors';
+import { accessValue } from './accessors';
 import { REST } from './constants';
 
 /**
@@ -79,10 +79,10 @@ export default {
       return this.dropdownLength === 1 ? 'viewport' : 'scrollParent';
     },
     detailsPath() {
-      return this.status[accessors[this.dataMethod].detailsPath];
+      return accessValue(this.dataMethod, 'detailsPath', this.status);
     },
     hasDetails() {
-      return this.status[accessors[this.dataMethod].hasDetails];
+      return accessValue(this.dataMethod, 'hasDetails', this.status);
     },
     status() {
       return this.job && this.job.status ? this.job.status : {};
diff --git a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
index 5e2d79758e1..830ad219574 100644
--- a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
@@ -5,7 +5,7 @@ import JobItem from './job_item.vue';
 import JobGroupDropdown from './job_group_dropdown.vue';
 import ActionComponent from './action_component.vue';
 import { GRAPHQL } from './constants';
-import { accessors } from './accessors';
+import { accessValue } from './accessors';
 
 export default {
   components: {
@@ -39,7 +39,6 @@ export default {
       default: () => ({}),
     },
   },
-  accessors,
   titleClasses: [
     'gl-font-weight-bold',
     'gl-pipeline-job-width',
@@ -56,8 +55,8 @@ export default {
     },
   },
   methods: {
-    getAccessor(property) {
-      return accessors[GRAPHQL][property];
+    getGroupId(group) {
+      return accessValue(GRAPHQL, 'groupId', group);
     },
     groupId(group) {
       return `ci-badge-${escape(group.name)}`;
@@ -87,7 +86,7 @@ export default {
       <div
         v-for="group in groups"
         :id="groupId(group)"
-        :key="group[getAccessor('groupId')]"
+        :key="getGroupId(group)"
         data-testid="stage-column-group"
         class="gl-relative gl-mb-3 gl-white-space-normal gl-pipeline-job-width"
       >
diff --git a/app/assets/javascripts/pipelines/components/header_component.vue b/app/assets/javascripts/pipelines/components/header_component.vue
index 741609c908a..af7c0d0ec3f 100644
--- a/app/assets/javascripts/pipelines/components/header_component.vue
+++ b/app/assets/javascripts/pipelines/components/header_component.vue
@@ -229,6 +229,7 @@ export default {
         v-if="pipeline.cancelable"
         :loading="isCanceling"
         :disabled="isCanceling"
+        class="gl-ml-3"
         variant="danger"
         data-testid="cancelPipeline"
         @click="cancelPipeline()"