diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-27 14:39:46 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-27 14:39:46 +0000 |
| commit | 771dfe062f700538e61d2fda08b2d6ccf7cdf906 (patch) | |
| tree | 3ddc9935fb8c00e1653de126d6fa5ce20a626b4a /app/assets | |
| parent | be06fcf044da875426e47a9d16a3d3753cbc69d8 (diff) | |
| parent | f1b99d7d61c7b93b209e200458bf01642c197ecb (diff) | |
| download | gitlab-ce-771dfe062f700538e61d2fda08b2d6ccf7cdf906.tar.gz | |
Merge branch '10711-pipeline-bundle' into 'master'
Removes EE differences for pipelines_details_bundle
Closes gitlab-ee#10711
See merge request gitlab-org/gitlab-ce!26654
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js | 10 | ||||
| -rw-r--r-- | app/assets/javascripts/pipelines/pipeline_details_bundle.js | 9 |
2 files changed, 10 insertions, 9 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 index 9177943f88a..dd79ade5bc9 100644 --- a/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js +++ b/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js @@ -1,6 +1,16 @@ +import Flash from '~/flash'; +import { __ } from '~/locale'; + export default { methods: { clickTriggeredByPipeline() {}, clickTriggeredPipeline() {}, + requestRefreshPipelineGraph() { + // When an action is clicked + // (wether in the dropdown or in the main nodes, we refresh the big graph) + this.mediator + .refreshPipeline() + .catch(() => Flash(__('An error occurred while making the request.'))); + }, }, }; diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js index 8adbd39edd4..6660f8120f8 100644 --- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js +++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js @@ -29,15 +29,6 @@ export default () => { mediator, }; }, - methods: { - requestRefreshPipelineGraph() { - // When an action is clicked - // (wether in the dropdown or in the main nodes, we refresh the big graph) - this.mediator - .refreshPipeline() - .catch(() => Flash(__('An error occurred while making the request.'))); - }, - }, render(createElement) { return createElement('pipeline-graph', { props: { |