diff options
author | Phil Hughes <me@iamphill.com> | 2019-03-14 15:44:14 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-14 15:44:14 +0000 |
commit | 7dc3221163a682a4259579cfefa8e0a794eb0e4b (patch) | |
tree | 6fcba9fa0c6529cd7e8b7b4dff9293e47a44e62e | |
parent | 94997fe76dc80cf125ed34573a13dd258773022d (diff) | |
parent | ebaeda8f6b218f3a0b3b05e82510ef1aa6946d8e (diff) | |
download | gitlab-ce-7dc3221163a682a4259579cfefa8e0a794eb0e4b.tar.gz |
Merge branch '10093-pipeline-bundle' into 'master'
Removes EE differences for pipeline_details_bundle
Closes gitlab-ee#10093
See merge request gitlab-org/gitlab-ce!26164
-rw-r--r-- | app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/pipelines/pipeline_details_bundle.js | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js b/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js new file mode 100644 index 00000000000..9177943f88a --- /dev/null +++ b/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js @@ -0,0 +1,6 @@ +export default { + methods: { + clickTriggeredByPipeline() {}, + clickTriggeredPipeline() {}, + }, +}; diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js index dc9befe6349..8adbd39edd4 100644 --- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js +++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js @@ -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), }, }); }, |