kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '10092-stage-column' into 'master'

Browse source 
Removes EE differences for stage column

Closes gitlab-ee#10092

See merge request gitlab-org/gitlab-ce!26114
This commit is contained in:
Phil Hughes 2019-03-14 11:53:55 +00:00
commit b5bf179e69
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
View file

@ -1,5 +1,6 @@
<script>
import _ from 'underscore';
import stageColumnMixin from 'ee_else_ce/pipelines/mixins/stage_column_mixin';
import JobItem from './job_item.vue';
import JobGroupDropdown from './job_group_dropdown.vue';
@ -8,6 +9,7 @@ export default {
JobItem,
JobGroupDropdown,
},
mixins: [stageColumnMixin],
props: {
title: {
type: String,
@ -32,9 +34,6 @@ export default {
groupId(group) {
return `ci-badge-${_.escape(group.name)}`;
},
buildConnnectorClass(index) {
return index === 0 && !this.isFirstColumn ? 'left-connector' : '';
},
pipelineActionRequestComplete() {
this.$emit('refreshPipelineGraph');
},

7
app/assets/javascripts/pipelines/mixins/stage_column_mixin.js Normal file
View file

@ -0,0 +1,7 @@
export default {
methods: {
buildConnnectorClass(index) {
return index === 0 && !this.isFirstColumn ? 'left-connector' : '';
},
},
};