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

Merge branch '10093-pipeline-bundle' into 'master'

Browse source 
Removes EE differences for pipeline_details_bundle

Closes gitlab-ee#10093

See merge request gitlab-org/gitlab-ce!26164
This commit is contained in:
Phil Hughes 2019-03-14 15:44:14 +00:00
commit 7dc3221163
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js Normal file
View file

@ -0,0 +1,6 @@
export default {
methods: {
clickTriggeredByPipeline() {},
clickTriggeredPipeline() {},
},
};

8
app/assets/javascripts/pipelines/pipeline_details_bundle.js
View file

@ -2,8 +2,9 @@ import Vue from 'vue';
import Flash from '~/flash';
import Translate from '~/vue_shared/translate';
import { __ } from '~/locale';
import pipelineGraph from 'ee_else_ce/pipelines/components/graph/graph_component.vue';
import GraphEEMixin from 'ee_else_ce/pipelines/mixins/graph_pipeline_bundle_mixin';
import PipelinesMediator from './pipeline_details_mediator';
import pipelineGraph from './components/graph/graph_component.vue';
import pipelineHeader from './components/header_component.vue';
import eventHub from './event_hub';
@ -22,6 +23,7 @@ export default () => {
components: {
pipelineGraph,
},
mixins: [GraphEEMixin],
data() {
return {
mediator,
@ -44,6 +46,10 @@ export default () => {
},
on: {
refreshPipelineGraph: this.requestRefreshPipelineGraph,
onClickTriggeredBy: (parentPipeline, pipeline) =>
this.clickTriggeredByPipeline(parentPipeline, pipeline),
onClickTriggered: (parentPipeline, pipeline) =>
this.clickTriggeredPipeline(parentPipeline, pipeline),
},
});
},